diff --git a/build.gradle b/build.gradle
index e37234e64c4..b55fc00554d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -370,15 +370,10 @@ task bundle(type: Tar) {
         include 'RELEASE_NOTES.md'
         include 'GRADLE_PLUGIN.md'
         exclude '**/gradle.properties'
+        exclude '**/settings.gradle'
         exclude '**/build'
         exclude '**/.gradle'
-        rename { String fileName ->
-            if (fileName == "gradle.properties.for_bundle") {
-                return "gradle.properties"
-            } else {
-                return fileName
-            }
-        }
+        rename('(.*)\\.for_bundle', '$1')
         into baseName
     }
     destinationDir = file('.')
diff --git a/samples/settings.gradle b/samples/settings.gradle
index 981a02417bf..6a58567ec4a 100644
--- a/samples/settings.gradle
+++ b/samples/settings.gradle
@@ -6,3 +6,5 @@ include ':nonBlockingEchoServer'
 include ':opengl'
 include ':socket'
 include ':tetris'
+
+includeBuild '../'
diff --git a/samples/settings.gradle.for_bundle b/samples/settings.gradle.for_bundle
new file mode 100644
index 00000000000..981a02417bf
--- /dev/null
+++ b/samples/settings.gradle.for_bundle
@@ -0,0 +1,8 @@
+include ':csvparser'
+include ':gitchurn'
+include ':gtk'
+include ':libcurl'
+include ':nonBlockingEchoServer'
+include ':opengl'
+include ':socket'
+include ':tetris'