diff --git a/build.gradle b/build.gradle
index 165c1fe420..c64b3b0ba3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -651,4 +651,18 @@ var srcDep = [
 
 srcDistTar.dependsOn srcDep
 srcDistZip.dependsOn srcDep
-rat.dependsOn srcDep
\ No newline at end of file
+rat.dependsOn srcDep
+
+task fixDistDir {
+    doLast {
+        ant.mkdir(dir: 'build/dist')
+        ant.move(todir: 'build/dist') {
+            fileset(dir: 'build/distributions', includes: '*')
+        }
+    }
+}
+
+binDistZip.finalizedBy fixDistDir
+binDistTar.finalizedBy fixDistDir
+srcDistZip.finalizedBy fixDistDir
+srcDistTar.finalizedBy fixDistDir