diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle
index 89d7423a7..df1f2ee83 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/gradle/source-layout.gradle
@@ -25,7 +25,7 @@ if (name.endsWith(".tests")) {
 }
 
 sourceSets.all {
-	resources.exclude '**/*.g', '**/*.xtext', '**/*.mwe2', '**/*.xtend', '**/*._trace'
+	resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace'
 }
 
 jar {
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle
index 2296c8c3d..fe383a5ad 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.gradle/org.xtext.example.gradle.parent/gradle/source-layout.gradle
@@ -15,6 +15,9 @@ jar {
 	from('model') {
 		into('model')
 	}
+	from(sourceSets.main.allSource) {
+		include '**/*.xtext'
+	}
 	manifest {
 		attributes 'Bundle-SymbolicName': project.name
 	}
diff --git a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
index 6da27c459..141b11be5 100644
--- a/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
+++ b/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
@@ -154,7 +154,7 @@ class ParentProjectDescriptor extends ProjectDescriptor {
 			}
 			
 			sourceSets.all {
-				resources.exclude '**/*.g', '**/*.xtext', '**/*.mwe2', '**/*.xtend', '**/*._trace'
+				resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace'
 			}
 		«ELSE»
 			sourceSets {
@@ -174,7 +174,12 @@ class ParentProjectDescriptor extends ProjectDescriptor {
 		jar {
 			from('model') {
 				into('model')
-			}
+			}
+			«IF config.sourceLayout != SourceLayout.PLAIN»
+				from(sourceSets.main.allSource) {
+					include '**/*.xtext'
+				}
+			«ENDIF»
 			manifest {
 				attributes 'Bundle-SymbolicName': project.name
 			}
diff --git a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
index 83972e874..197daecfa 100644
--- a/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
+++ b/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
@@ -398,7 +398,7 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
         _builder.append("sourceSets.all {");
         _builder.newLine();
         _builder.append("\t");
-        _builder.append("resources.exclude \'**/*.g\', \'**/*.xtext\', \'**/*.mwe2\', \'**/*.xtend\', \'**/*._trace\'");
+        _builder.append("resources.exclude \'**/*.g\', \'**/*.mwe2\', \'**/*.xtend\', \'**/*._trace\'");
         _builder.newLine();
         _builder.append("}");
         _builder.newLine();
@@ -481,6 +481,22 @@ public class ParentProjectDescriptor extends ProjectDescriptor {
     _builder.append("\t");
     _builder.append("}");
     _builder.newLine();
+    {
+      SourceLayout _sourceLayout_1 = this.getConfig().getSourceLayout();
+      boolean _notEquals = (!Objects.equal(_sourceLayout_1, SourceLayout.PLAIN));
+      if (_notEquals) {
+        _builder.append("\t");
+        _builder.append("from(sourceSets.main.allSource) {");
+        _builder.newLine();
+        _builder.append("\t");
+        _builder.append("\t");
+        _builder.append("include \'**/*.xtext\'");
+        _builder.newLine();
+        _builder.append("\t");
+        _builder.append("}");
+        _builder.newLine();
+      }
+    }
     _builder.append("\t");
     _builder.append("manifest {");
     _builder.newLine();