diff --git a/Essentials/pom.xml b/Essentials/pom.xml
index aade61eeb..7bb17d3d4 100644
--- a/Essentials/pom.xml
+++ b/Essentials/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>Essentials</artifactId>
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 5c84fa7e5..c147c7428 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -2,7 +2,7 @@
 name: Essentials
 main: com.earth2me.essentials.Essentials
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Provides an essential, core set of commands for Bukkit.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Iaccidentally]
diff --git a/EssentialsAntiBuild/pom.xml b/EssentialsAntiBuild/pom.xml
index 45deb6a4e..570ed5b97 100644
--- a/EssentialsAntiBuild/pom.xml
+++ b/EssentialsAntiBuild/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsAntiBuild</artifactId>
diff --git a/EssentialsAntiBuild/src/plugin.yml b/EssentialsAntiBuild/src/plugin.yml
index cfe6e6367..99f4f760a 100644
--- a/EssentialsAntiBuild/src/plugin.yml
+++ b/EssentialsAntiBuild/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsAntiBuild
 main: com.earth2me.essentials.antibuild.EssentialsAntiBuild
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Provides build protection.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, Iaccidentally]
diff --git a/EssentialsChat/pom.xml b/EssentialsChat/pom.xml
index 8289affc1..7d927fa41 100644
--- a/EssentialsChat/pom.xml
+++ b/EssentialsChat/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsChat</artifactId>
diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml
index b75ab8ecc..f0b122177 100644
--- a/EssentialsChat/src/plugin.yml
+++ b/EssentialsChat/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsChat
 main: com.earth2me.essentials.chat.EssentialsChat
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Provides chat control features for Essentials.  Requires Permissions.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy, Iaccidentally]
diff --git a/EssentialsGeoIP/pom.xml b/EssentialsGeoIP/pom.xml
index 97b442068..1100dfbe4 100644
--- a/EssentialsGeoIP/pom.xml
+++ b/EssentialsGeoIP/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsGeoIP</artifactId>
diff --git a/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml
index adf75b83d..d3545e7a9 100644
--- a/EssentialsGeoIP/src/plugin.yml
+++ b/EssentialsGeoIP/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsGeoIP
 main: com.earth2me.essentials.geoip.EssentialsGeoIP
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Shows the country or city of a user on login and /whois.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
diff --git a/EssentialsProtect/pom.xml b/EssentialsProtect/pom.xml
index d47d4edaf..7408b33dd 100644
--- a/EssentialsProtect/pom.xml
+++ b/EssentialsProtect/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsProtect</artifactId>
diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml
index bf7389a91..1b326ca5e 100644
--- a/EssentialsProtect/src/plugin.yml
+++ b/EssentialsProtect/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsProtect
 main: com.earth2me.essentials.protect.EssentialsProtect
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Provides protection for various parts of the world.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits]
diff --git a/EssentialsSpawn/pom.xml b/EssentialsSpawn/pom.xml
index d49283dac..546fc5ae3 100644
--- a/EssentialsSpawn/pom.xml
+++ b/EssentialsSpawn/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsSpawn</artifactId>
diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml
index 21f77db78..2ed5f7630 100644
--- a/EssentialsSpawn/src/plugin.yml
+++ b/EssentialsSpawn/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsSpawn
 main: com.earth2me.essentials.spawn.EssentialsSpawn
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://tiny.cc/EssentialsCommands
 description: Provides spawn control commands, utilizing Essentials.
 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits]
diff --git a/EssentialsXMPP/pom.xml b/EssentialsXMPP/pom.xml
index 267135c72..e92fcafb4 100644
--- a/EssentialsXMPP/pom.xml
+++ b/EssentialsXMPP/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>net.ess3</groupId>
         <artifactId>EssentialsParent</artifactId>
-        <version>2.x-SNAPSHOT</version>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>EssentialsXMPP</artifactId>
diff --git a/EssentialsXMPP/src/plugin.yml b/EssentialsXMPP/src/plugin.yml
index 2f65b857c..35ee4c4d6 100644
--- a/EssentialsXMPP/src/plugin.yml
+++ b/EssentialsXMPP/src/plugin.yml
@@ -2,7 +2,7 @@
 name: EssentialsXMPP
 main: com.earth2me.essentials.xmpp.EssentialsXMPP
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: ${project.version}
 website: http://ess.khhq.net/wiki/XMPP
 description: Provides xmpp communication.
 authors: