diff --git a/src/main/java/org/dynmap/DynmapCore.java b/src/main/java/org/dynmap/DynmapCore.java
index 0b14d4e6..39b0a878 100644
--- a/src/main/java/org/dynmap/DynmapCore.java
+++ b/src/main/java/org/dynmap/DynmapCore.java
@@ -35,6 +35,7 @@ import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.yaml.snakeyaml.Yaml;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServlet;
@@ -42,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
 
 public class DynmapCore {
     private DynmapServerInterface server;
-    private String version = "0.30-dev";
+    private String version;
     private Server webServer = null;
     private ServletContextHandler webServerContextHandler = null;
     public MapManager mapManager = null;
@@ -222,6 +223,9 @@ public class DynmapCore {
     public boolean enableCore() {
         /* Start with clean events */
         events = new Events();
+
+        /* Load plugin version info */
+        loadVersion();
         
         /* Initialize confguration.txt if needed */
         File f = new File(dataDirectory, "configuration.txt");
@@ -337,7 +341,7 @@ public class DynmapCore {
         });
         
         /* Print version info */
-        Log.info("version " + version + " is enabled" );
+        Log.info("version " + plugin_ver + " is enabled - core version " + version );
 
         events.<Object>trigger("initialized", null);
         
@@ -1244,4 +1248,16 @@ public class DynmapCore {
     public boolean processWorldLoad(DynmapWorld w) {
         return mapManager.activateWorld(w);
     }
+    
+    /* Load core version */
+    private void loadVersion() {
+        InputStream in = getClass().getResourceAsStream("/core.yml");
+        if(in == null)
+            return;
+        Yaml yaml = new Yaml();
+        @SuppressWarnings("unchecked")
+        Map<String,Object> val = (Map<String,Object>)yaml.load(in);
+        if(val != null)
+            version = (String)val.get("version");
+    }
 }
diff --git a/src/main/resources/core.yml b/src/main/resources/core.yml
new file mode 100644
index 00000000..b5a24bff
--- /dev/null
+++ b/src/main/resources/core.yml
@@ -0,0 +1,3 @@
+version: "${project.version}-${BUILD_NUMBER}"
+authors: [FrozenCow, mikeprimm]
+