2 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c9fc8d7e..45728ccf 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -51,7 +51,7 @@ public final class Bukkit {
         }
 
         Bukkit.server = server;
-        server.getLogger().info("This server is running " + getName() + " version " + getVersion());
+        server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")");
     }
 
     public static String getName() {
@@ -62,6 +62,10 @@ public final class Bukkit {
         return server.getVersion();
     }
 
+    public static String getBukkitVersion() {
+        return server.getBukkitVersion();
+    }
+
     public static Player[] getOnlinePlayers() {
         return server.getOnlinePlayers();
     }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ca71d8d4..3870bd80 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -53,6 +53,13 @@ public interface Server {
      * @return version of this server implementation
      */
     public String getVersion();
+    
+    /**
+     * Gets the Bukkit version that this server is running.
+     * 
+     * @return Version of Bukkit
+     */
+    public String getBukkitVersion();
 
     /**
      * Gets a list of all currently logged in players