diff --git a/build.gradle b/build.gradle
index a75e2cb23..aba11f3c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ sourceSets {
         }
         resources {
             srcDirs 'src', 'toolsrc'
-            include "**/*.properties"
+            include "*.properties"
         }
     }
 
@@ -39,6 +39,7 @@ sourceSets {
         }
         resources {
             srcDirs "testsrc"
+            include "*.properties"
         }
     }
 }
@@ -222,13 +223,10 @@ checkstyle {
 distributions {
     main {
         contents {
-            from(sourceSets.main.java) {
+            from(sourceSets.main.allSource) {
                 exclude 'man'
                 into 'rhino' + project.version + '/src'
             }
-            from(sourceSets.main.resources) {
-                into 'rhino' + project.version + '/src'
-            }
             from(javadoc.destinationDir) {
                 into 'rhino' + project.version + '/docs'
             }