diff --git a/pom.xml b/pom.xml
index 23924a3d66..4101ad3a2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bukkit</groupId>
   <artifactId>craftbukkit</artifactId>
+  <packaging>jar</packaging>
   <version>0.0.1-SNAPSHOT</version>
   <name>CraftBukkit</name>
   <url>http://www.bukkit.org</url>
   <properties>
-    <build.version>unknown</build.version>
     <api.version>unknown</api.version>
   </properties>
   <scm>
@@ -21,6 +21,12 @@
       <url>http://artifacts.lukegb.com/artifactory/repo</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>bukkit-plugins</id>
+      <url>http://artifacts.lukegb.com/artifactory/repo</url>
+    </pluginRepository>
+  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>org.bukkit</groupId>
@@ -44,7 +50,25 @@
   </dependencies>
   <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
   <build>
+    <defaultGoal>clean install</defaultGoal>
     <plugins>
+      <plugin>
+        <groupId>com.lukegb.mojo</groupId>
+        <artifactId>gitdescribe-maven-plugin</artifactId>
+        <version>1.2</version>
+        <configuration>
+          <outputPrefix>git-Bukkit-</outputPrefix>
+          <outputPostfix></outputPostfix>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>gitdescribe</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -54,7 +78,7 @@
             <manifestEntries>
               <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
               <Implementation-Title>CraftBukkit</Implementation-Title>
-              <Implementation-Version>${build.version}</Implementation-Version>
+              <Implementation-Version>${describe}</Implementation-Version>
               <Implementation-Vendor>Bukkit Team</Implementation-Vendor>
               <Specification-Title>Bukkit</Specification-Title>
               <Specification-Version>${api.version}</Specification-Version>