diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 800cbc71..4f1886fc 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -185,9 +185,14 @@ public class AuthMe extends JavaPlugin {
     // TODO: enhance this
     private void setupConstants() {
         String versionRaw = this.getDescription().getVersion();
-        pluginVersion = versionRaw.substring(0, versionRaw.indexOf("-b"));
-        String buildRaw = versionRaw.substring(1, versionRaw.indexOf("-b"));
-        pluginBuildNumber = buildRaw.substring(0, buildRaw.indexOf("-t"));
+        int index = versionRaw.lastIndexOf("-");
+        if (index != -1) {
+            pluginVersion = versionRaw.substring(0, index);
+            pluginBuildNumber = versionRaw.substring(index + 1);
+            if (pluginBuildNumber.startsWith("b")) {
+                pluginBuildNumber = pluginBuildNumber.substring(1);
+            }
+        }
     }
 
     /**
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 3cb51c69..d037f06f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ authors: [${pluginAuthors}]
 website: ${project.url}
 description: ${project.description}
 main: ${mainClass}
-version: ${project.version}-b${buildNumber}-t${build.time}
+version: ${project.version}-b${buildNumber}
 softdepend:
     - Vault
     - PermissionsBukkit