diff --git a/forge/build.gradle b/forge/build.gradle
index 90a0b864..40db0b68 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -149,3 +149,14 @@ unifiedPublishing {
         }
     }
 }
+
+// Update mods.toml with the new versions automatically
+// Not using processResources because it is easier to do this manually, and see it reflected immediately
+afterEvaluate {
+    file("src/main/resources/META-INF/mods.toml").withOutputStream {
+        it << file("mods.toml").text
+                .replaceAll("@LOADER_MAJOR@", rootProject.forge_version.split("\\.")[0])
+                .replaceAll("@MINECRAFT_VERSION@", rootProject.architectury.minecraft)
+                .replaceAll("@FORGE_VERSION@", rootProject.forge_version)
+    }
+}
diff --git a/forge/mods.toml b/forge/mods.toml
new file mode 100644
index 00000000..16817649
--- /dev/null
+++ b/forge/mods.toml
@@ -0,0 +1,29 @@
+modLoader = "javafml"
+loaderVersion = "[@LOADER_MAJOR@,)"
+issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
+license = "GNU LGPLv3"
+
+[[mods]]
+modId = "architectury"
+version = "${version}"
+displayName = "Architectury"
+authors = "shedaniel"
+description = '''
+A intermediary api aimed to ease developing multiplatform mods.
+'''
+logoFile = "icon.png"
+license = "LGPL-3"
+
+[[dependencies.architectury]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[@MINECRAFT_VERSION@,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.architectury]]
+modId = "forge"
+mandatory = true
+versionRange = "[@FORGE_VERSION@,)"
+ordering = "NONE"
+side = "BOTH"
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 5e48548d..6897f7ed 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[38,)"
+loaderVersion = "[40,)"
 issueTrackerURL = "https://github.com/shedaniel/architectury/issues"
 license = "GNU LGPLv3"
 
@@ -24,6 +24,6 @@ side = "BOTH"
 [[dependencies.architectury]]
 modId = "forge"
 mandatory = true
-versionRange = "[38.0.17,)"
+versionRange = "[40.1.14,)"
 ordering = "NONE"
 side = "BOTH"