diff --git a/features/org.eclipse.graphiti.feature/.gitignore b/features/org.eclipse.graphiti.feature/.gitignore
index 5e56e04..06ba672 100644
--- a/features/org.eclipse.graphiti.feature/.gitignore
+++ b/features/org.eclipse.graphiti.feature/.gitignore
@@ -1 +1,2 @@
 /bin
+/target/
diff --git a/features/org.eclipse.graphiti.feature/.project b/features/org.eclipse.graphiti.feature/.project
index a328ad3..bef7c1a 100644
--- a/features/org.eclipse.graphiti.feature/.project
+++ b/features/org.eclipse.graphiti.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/features/org.eclipse.graphiti.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.graphiti.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/features/org.eclipse.graphiti.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.graphiti.feature/.settings/org.eclipse.m2e.core.prefs b/features/org.eclipse.graphiti.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/features/org.eclipse.graphiti.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/features/org.eclipse.graphiti.feature/pom.xml b/features/org.eclipse.graphiti.feature/pom.xml
new file mode 100644
index 0000000..3f81161
--- /dev/null
+++ b/features/org.eclipse.graphiti.feature/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.graphiti</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.12.0-SNAPSHOT</version>
+		<relativePath>../../parent</relativePath>
+	</parent>
+
+	<name>Graphiti Feature</name>
+	<artifactId>org.eclipse.graphiti.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+</project>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index fbe3ac2..3b63a23 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -97,6 +97,7 @@
 		<module>../examples/org.eclipse.graphiti.examples.filesystem</module>
 		<module>../examples/org.eclipse.graphiti.ui.capabilities</module>
 		<module>../examples/org.eclipse.graphiti.doc</module>
+		<module>../features/org.eclipse.graphiti.feature</module>
 	</modules>
 
 	<build>