diff --git a/build.gradle b/build.gradle
index e7a26020..24c4d968 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,6 +87,10 @@ allprojects {
             return changes.toString()
         }
     }
+
+    java {
+        withSourcesJar()
+    }
 }
 
 task licenseFormatAll
diff --git a/common/build.gradle b/common/build.gradle
index c6d4fe16..95feb644 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -14,20 +14,22 @@ architectury {
     common(false)
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+afterEvaluate {
+    remapJar {
+        remapAccessWidener.set false
+    }
 }
 
 publishing {
     publications {
         mavenCommon(MavenPublication) {
             artifactId = rootProject.archivesBaseName
-            artifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
-                builtBy build
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
+            artifact(remapJar)
+            afterEvaluate {
+                artifact(remapSourcesJar.output) {
+                    builtBy remapSourcesJar
+                    classifier "sources"
+                }
             }
         }
     }
diff --git a/common/src/main/resources/fabric.mod.json b/common/src/main/resources/fabric.mod.json
deleted file mode 100644
index 50ea013b..00000000
--- a/common/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "_comment": "This file is here to make fabric loader load this on the Knot classloader.",
-  "schemaVersion": 1,
-  "id": "architectury-common",
-  "version": "0.0.1",
-  "accessWidener": "architectury.accessWidener"
-}
\ No newline at end of file
diff --git a/fabric/build.gradle b/fabric/build.gradle
index ed6ba25a..4a78d6a1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -61,13 +61,28 @@ remapJar {
     archiveClassifier = "fabric"
 }
 
+sourcesJar {
+    afterEvaluate {
+        [":common"].forEach {
+            def depSources = project(it).sourcesJar
+            dependsOn depSources
+            from(depSources.archiveFile.map { zipTree(it) }) {
+                exclude "architectury.accessWidener"
+            }
+        }
+    }
+}
+
 publishing {
     publications {
         mavenFabric(MavenPublication) {
             artifactId = rootProject.archivesBaseName + "-fabric"
-            artifact(remapJar.archivePath) {
-                builtBy build
-                classifier null
+            artifact(remapJar) { classifier null }
+            afterEvaluate {
+                artifact(remapSourcesJar.output) {
+                    builtBy remapSourcesJar
+                    classifier "sources"
+                }
             }
         }
     }
diff --git a/forge/build.gradle b/forge/build.gradle
index cba3b648..d1826df5 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -58,13 +58,28 @@ remapJar {
     archiveClassifier = "forge"
 }
 
+sourcesJar {
+    afterEvaluate {
+        [":common"].forEach {
+            def depSources = project(it).sourcesJar
+            dependsOn depSources
+            from(depSources.archiveFile.map { zipTree(it) }) {
+                exclude "architectury.accessWidener"
+            }
+        }
+    }
+}
+
 publishing {
     publications {
         mavenForge(MavenPublication) {
             artifactId = rootProject.archivesBaseName + "-forge"
-            artifact(remapJar.archivePath) {
-                builtBy build
-                classifier null
+            artifact(remapJar) { classifier null }
+            afterEvaluate {
+                artifact(remapSourcesJar.output) {
+                    builtBy remapSourcesJar
+                    classifier "sources"
+                }
             }
         }
     }