diff --git a/build.gradle b/build.gradle
index 3218006718e..40a3f10ba69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,8 @@ if (project.hasProperty('enableSonar')) {
     apply plugin: 'org.sonarqube'
 }
 
-boolean isCIBuild = false;
+boolean isCIBuild = false
+String date = new Date().format('yyyyMMdd')
 
 // For help converting an Ant build to a Gradle build, see
 // https://docs.gradle.org/current/userguide/ant.html
@@ -99,7 +100,7 @@ allprojects {
 //    apply plugin: 'eclipse'
     apply plugin: 'idea'
 
-    version = '5.2.4'
+    version = '5.2.5-SNAPSHOT'
 }
 
 /**
@@ -722,14 +723,7 @@ tasks.withType(Tar) {
 }
 
 distributions {
-    var version = subprojects[0].version
-    var date = new Date().format('yyyyMMdd')
-
-    var poiDep = project(':poi').configurations.getAt('compileClasspath')
-    var ooxmlImp = project(':poi-ooxml').configurations.getAt('compileClasspath')
-
     src {
-        distributionBaseName = "poi-src-${version}-${date}"
         contents {
             from('.') {
                 exclude '*/build/**'
@@ -819,6 +813,8 @@ var srcDep = [
     ':poi-ooxml-lite:generateModuleInfo'
 ]
 
+srcDistTar.setArchiveFileName("poi-src-${subprojects[0].version}-${date}.tgz")
+srcDistZip.setArchiveFileName("poi-src-${subprojects[0].version}-${date}.zip")
 srcDistTar.dependsOn srcDep
 srcDistZip.dependsOn srcDep
 soLinkCheck.dependsOn srcDep
diff --git a/build.xml b/build.xml
index 3b550df1cdc..2926b4f5f15 100644
--- a/build.xml
+++ b/build.xml
@@ -42,7 +42,7 @@ under the License.
 
     <description>The Apache POI project Ant build.</description>
 
-    <property name="version.id" value="5.2.4"/>
+    <property name="version.id" value="5.2.5-SNAPSHOT"/>
     <property name="release.rc" value=""/>
 
     <property environment="env"/>
diff --git a/osgi/pom.xml b/osgi/pom.xml
index 4de8b5ba861..770fff480b2 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -24,12 +24,12 @@
     <groupId>org.apache.poi</groupId>
     <artifactId>poi-bundle</artifactId>
     <packaging>bundle</packaging>
-    <version>5.2.4</version>
+    <version>5.2.5-SNAPSHOT</version>
 
     <name>Apache POI OSGi bundle</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <poi.version>5.2.4</poi.version>
+        <poi.version>5.2.5-SNAPSHOT</poi.version>
         <pax.exam.version>4.12.0</pax.exam.version>
     </properties>