diff --git a/build.gradle b/build.gradle
index fc2e9916f..d285c510f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,11 +22,14 @@ file "build.properties" withReader {
 
 version = "${config.oc.version}"
 group = "li.cil.oc"
-archivesBaseName = "OpenComputers-MC${config.minecraft.version}"
+archivesBaseName = "OpenComputers"
 
 if (System.getenv("BUILD_NUMBER") != null)
     version += ".${System.getenv("BUILD_NUMBER")}"
 
+ext.simpleVersion = version
+version = "MC${config.minecraft.version}-${project.version}"
+
 apply from: 'gradle/forge.gradle'
 apply from: 'gradle/artifact.gradle'
 apply from: 'gradle/release.gradle'
diff --git a/gradle/artifact.gradle b/gradle/artifact.gradle
index d7f429c94..54e67fbeb 100644
--- a/gradle/artifact.gradle
+++ b/gradle/artifact.gradle
@@ -1,7 +1,8 @@
 jar {
     classifier = 'universal'
     manifest {
-        attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader", FMLCorePluginContainsFMLMod: "true"
+        attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader"
+        attributes FMLCorePluginContainsFMLMod: "true"
     }
 }
 
diff --git a/gradle/forge.gradle b/gradle/forge.gradle
index 5dfc3cc5a..b51972ec1 100644
--- a/gradle/forge.gradle
+++ b/gradle/forge.gradle
@@ -18,7 +18,7 @@ minecraft {
 processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod/info'
-        expand 'version':project.version, 'mcversion':config.minecraft.version
+        expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
     }
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
diff --git a/gradle/release.gradle b/gradle/release.gradle
index 08b82d859..9c7607807 100644
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -3,7 +3,6 @@ apply plugin: 'maven-publish'
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            version "MC${minecraft.version}-${project.version}"
             artifact apiJar
             artifact deobfJar
         }