diff --git a/build.gradle b/build.gradle
index 255f20b2..74a55520 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,13 +25,15 @@ import org.ajoberstar.grgit.Grgit
 
 def repo = Grgit.open(project.file('.'))
 project.ext.gitHash = repo.log().find().abbreviatedId
+def branchname = repo.branch.getCurrent().fullName
+branchname = branchname.substring(branchname.lastIndexOf('/') + 1)
 
 boolean dev = System.getenv("RELEASE") == null || System.getenv("RELEASE").equalsIgnoreCase("false")
 
 ext.buildnumber = 0
 project.buildnumber = System.getenv('BUILD_NUMBER') == null ? "CUSTOM" : System.getenv('BUILD_NUMBER')
 
-version = dev ? project.ext.gitHash + "-${buildnumber}" : "MC${minecraft_version}-${mod_version}.${buildnumber}"
+version = dev ? "${branchname}-${project.ext.gitHash}-${buildnumber}" : "MC${minecraft_version}-${mod_version}.${buildnumber}"
 group = "team.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = dev ? "Chisel_DEV" : "Chisel"