diff --git a/tools/archetype/binding/src/main/resources/META-INF/archetype-post-generate.groovy b/tools/archetype/binding/src/main/resources/META-INF/archetype-post-generate.groovy
index 8983c88fd..ecbf402ed 100644
--- a/tools/archetype/binding/src/main/resources/META-INF/archetype-post-generate.groovy
+++ b/tools/archetype/binding/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -75,33 +75,6 @@ def addBundleToBom(bundleAfter, newBundle) {
      println 'Added bundle to bom pom'
 }
 
-/**
- * Add the new bundle to the feature.xml
- */
-def addBundleToFeature(bundleAfter, newBundle, bundleName) {
-    def feature = '''
-    <feature name="##1" description="##2 Binding" version="${project.version}">
-        <feature>openhab-runtime-base</feature>
-        <bundle start-level="80">mvn:org.openhab.addons.bundles/##3/${project.version}</bundle>
-    </feature>
-'''.replace('##1', newBundle.replace('org.', '').replace('.', '-')).replace('##2', bundleName).replace('##3', newBundle)
-    def bomFile = new File(outputDirectory, '../features/openhab-addons/src/main/feature/feature.xml')
-    def newContent = ''
-    def insertIndex = 0;
-    def lines = bomFile.eachLine { line, index ->
-        newContent += line + nl
-        if (line.contains(bundleAfter) && line.contains('<bundle')) {
-            insertIndex = index + 1
-        }
-        if (insertIndex > 0 && index == insertIndex) {
-            newContent += feature
-            insertIndex = 0
-        }
-    }
-     bomFile.write(newContent)
-     println 'Added bundle to feature.xml'
-}
-
 //
 /**
  * Fix the bundle parent pom. The maven archytype adds the bundle, but add the end of the module list.
@@ -139,7 +112,6 @@ if (codeownersFile.exists()) {
     println 'Add new bundle after: ' + bundleAfter
     addUserToCodewoners(githubUser, codeownersFile, bundleAfter, newBundle)
     addBundleToBom(bundleAfter, newBundle)
-    addBundleToFeature(bundleAfter, newBundle, bundleName)
     fixBundlePom(bundleAfter, newBundle)
 
     println ''
diff --git a/tools/archetype/binding/src/main/resources/META-INF/maven/archetype-metadata.xml b/tools/archetype/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
index bbee5f973..89163230d 100644
--- a/tools/archetype/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/tools/archetype/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -34,6 +34,12 @@
 				<include>README.md</include>
 			</includes>
 		</fileSet>
+		<fileSet filtered="true" packaged="false" encoding="UTF-8">
+			<directory>src/main/feature</directory>
+			<includes>
+				<include>feature.xml</include>
+			</includes>
+		</fileSet>
 		<fileSet filtered="true" packaged="false" encoding="UTF-8">
 			<directory>src/main/resources/ESH-INF</directory>
 			<includes>
diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml
new file mode 100644
index 000000000..cba4b5e19
--- /dev/null
+++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<features name="${rootArtifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+    <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${project.version}/xml/features</repository>
+
+    <feature name="openhab-binding-${bindingId}" description="${bindingIdCamelCase} Binding" version="${project.version}">
+        <feature>openhab-runtime-base</feature>
+        <bundle start-level="80">mvn:org.openhab.addons.bundles/${rootArtifactId}/${project.version}</bundle>
+    </feature>
+</features>