diff --git a/pom.xml b/pom.xml
index ad52631da2..20d66236d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,7 @@
   <url>http://www.bukkit.org</url>
   <properties>
     <build.version>unknown</build.version>
+	<api.version>unknown</api.version>
   </properties>
   <repositories>
     <repository>
@@ -54,7 +55,12 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <manifestEntries>
                     <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
-                    <Build-Version>${build.version}</Build-Version>
+					<Implementation-Title>CraftBukkit</Implementation-Title>
+                    <Implementation-Version>${build.version}</Implementation-Version>
+					<Implementation-Vendor>Bukkit Team</Implementation-Title>
+					<Specification-Title>Bukkit</Specification-Title>
+					<Specification-Version>${api.version}</Specification-Version>
+					<Specification-Vendor>Bukkit Team</Specification-Vendor>
                   </manifestEntries>
                 </transformer>
               </transformers>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 004a6a6e6c..ec8db4f394 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -19,7 +19,8 @@ import org.bukkit.plugin.java.JavaPluginLoader;
 
 public final class CraftServer implements Server {
     private final String serverName = "Craftbukkit";
-    private final String serverVersion = "1.2_01";
+	private final String serverVersion;
+    private final String protocolVersion = "1.2_01";
     private final PluginManager pluginManager = new SimplePluginManager(this);
     private final CommandMap commandMap = new SimpleCommandMap(this);
     protected final MinecraftServer console;
@@ -28,6 +29,7 @@ public final class CraftServer implements Server {
     public CraftServer(MinecraftServer console, ServerConfigurationManager server) {
         this.console = console;
         this.server = server;
+		this.serverVersion = CraftServer.class.getPackage().getImplementationVersion();
 
         pluginManager.RegisterInterface(JavaPluginLoader.class);
     }
@@ -66,7 +68,7 @@ public final class CraftServer implements Server {
     }
 
     public String getVersion() {
-        return serverVersion;
+        return serverVersion + " (MC: " + protocolVersion + ")";
     }
 
     public Player[] getOnlinePlayers() {