diff --git a/gradle/changelog/scm_handler_info.yaml b/gradle/changelog/scm_handler_info.yaml
new file mode 100644
index 0000000000..9ff5103ebb
--- /dev/null
+++ b/gradle/changelog/scm_handler_info.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: SCM handler information in scm-git-plugin and scm-svn-plugin (accessed by scm-support-plugin)
diff --git a/scm-plugins/scm-git-plugin/build.gradle b/scm-plugins/scm-git-plugin/build.gradle
index 156fa54a55..f79349dca2 100644
--- a/scm-plugins/scm-git-plugin/build.gradle
+++ b/scm-plugins/scm-git-plugin/build.gradle
@@ -56,6 +56,17 @@ task testJar(type: Jar) {
 	from sourceSets.test.output
 }
 
+task insertJGitVersionFile() {
+  def file = new File(project.buildDir, "resources/main/sonia/scm/version/scm-git-plugin")
+  file.parentFile.mkdirs()
+  file.createNewFile()
+  file.text = "scm-git-plugin/${project.version} org.eclipse.jgit/${jgitVersion}"
+}
+
+tasks.named("build") {
+  it.finalizedBy(insertJGitVersionFile)
+}
+
 configurations {
   tests {
     canBeConsumed = true
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/version/scm-git-plugin b/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/version/scm-git-plugin
deleted file mode 100644
index 759da3c519..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/resources/sonia/scm/version/scm-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-scm-git-plugin/${project.version} org.eclipse.jgit/${jgit.version}
\ No newline at end of file
diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle
index 35084e3133..1472d17a81 100644
--- a/scm-plugins/scm-svn-plugin/build.gradle
+++ b/scm-plugins/scm-svn-plugin/build.gradle
@@ -63,6 +63,17 @@ task testJar(type: Jar) {
 	from sourceSets.test.output
 }
 
+task insertSVNKitVersionFile() {
+  def file = new File(project.buildDir, "resources/main/sonia/scm/version/scm-svn-plugin")
+  file.parentFile.mkdirs()
+  file.createNewFile()
+  file.text = "scm-svn-plugin/${project.version} svnkit/${svnkitVersion}"
+}
+
+tasks.named("build") {
+  it.finalizedBy(insertSVNKitVersionFile)
+}
+
 configurations {
   tests {
     canBeConsumed = true
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/version/scm-svn-plugin b/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/version/scm-svn-plugin
deleted file mode 100644
index 76fa1f0105..0000000000
--- a/scm-plugins/scm-svn-plugin/src/main/resources/sonia/scm/version/scm-svn-plugin
+++ /dev/null
@@ -1 +0,0 @@
-scm-svn-plugin/${project.version} svnkit/${svnkit.version}
\ No newline at end of file