diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle
index 3c5516d7..dc2f4bbe 100644
--- a/arclight-common/build.gradle
+++ b/arclight-common/build.gradle
@@ -93,6 +93,27 @@ jar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
+task srgJar(type: Jar) {
+    from(tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) {
+        include 'io/izzel/**'
+        exclude 'io/izzel/arclight/common/mixin/**'
+    }
+    archiveClassifier.set('srg')
+}
+
+task spigotJar(type: Jar) {
+    with tasks.srgJar
+    doLast {
+        def task = tasks.create('renameSpigotJar', net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace)
+        task.input.set(archiveFile.get().asFile)
+        task.hasLog = false
+        task.mappings.set(project.file('build/arclight_cache/tmp_srg/bukkit_srg.srg'))
+        task.args.add('--reverse')
+        task.apply()
+    }
+    archiveClassifier.set('spigot')
+}
+
 afterEvaluate {
     tasks.reobfJar.configure {
         it.extraMappings.from(project.files('extra_mapping.tsrg'))
diff --git a/arclight-forge/build.gradle b/arclight-forge/build.gradle
index e0207642..e222169c 100644
--- a/arclight-forge/build.gradle
+++ b/arclight-forge/build.gradle
@@ -196,39 +196,6 @@ compileApplaunchJava {
     sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_7
 }
 
-task srgJar(type: Jar) {
-    from(tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) {
-        include 'io/izzel/**'
-        exclude 'io/izzel/arclight/common/mixin/**'
-    }
-    archiveClassifier.set('srg')
-}
-
-task spigotJar(type: Jar) {
-    with tasks.srgJar
-    doLast {
-        def task = tasks.create('renameSpigotJar', net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace)
-        task.input = archiveFile.get().asFile
-        task.hasLog = false
-        task.mappings = project(':arclight-common').file('build/arclight_cache/tmp_srg/bukkit_srg.srg')
-        def args = task.args.toList()
-        args.add('--reverse')
-        task.setArgs(args)
-        task.apply()
-    }
-    archiveClassifier.set('spigot')
-}
-/*
-task sourceJar(type: Jar) {
-    from(sourceSets.main.allSource)
-    for (def s in [':i18n-config', ':arclight-common', ':forge-installer']) {
-        from(project(s).sourceSets.main.allSource) {
-            exclude 'io/izzel/arclight/common/mixin/**'
-        }
-    }
-    classifier = 'sources'
-}*/
-
 publishing {
     repositories {
         maven {
@@ -242,8 +209,8 @@ publishing {
     }
     publications {
         mavenJava(MavenPublication) {
-            artifact srgJar
-            artifact spigotJar
+            artifact project(':arclight-common').tasks.srgJar
+            artifact project(':arclight-common').tasks.spigotJar
             //artifact sourceJar
         }
     }