diff --git a/framework/NOTICE b/framework/NOTICE
deleted file mode 100644
index c530b6b..0000000
--- a/framework/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Felix Framework
-Copyright 2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
diff --git a/framework/pom.xml b/framework/pom.xml
index b0b0bbb..9b5b711 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
-    <version>1.2.1</version>
+    <version>2.1</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -58,25 +58,30 @@
             <Export-Package>org.osgi.framework.*;-split-package:=merge-first,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
             <Private-Package>org.apache.felix.framework.*</Private-Package>
             <Import-Package>!*</Import-Package>
-            <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource> 
           </instructions>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <configuration>
-          <excludeSubProjects>false</excludeSubProjects>
-          <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-          <excludes>
-            <param>doc/*</param>
-            <param>maven-eclipse.xml</param>
-            <param>.checkstyle</param>
-            <param>.externalToolBuilders/*</param>
-          </excludes>
-        </configuration>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <executions>
+              <execution>
+                  <phase>verify</phase>
+                  <goals>
+                      <goal>check</goal>
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+              <includes>
+                  <include>src/**</include>
+              </includes>
+              <excludes>
+                  <exclude>src/main/appended-resources/**</exclude>
+                  <exclude>src/**/packageinfo</exclude>
+                  <exclude>src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory</exclude>
+              </excludes>
+            </configuration>
       </plugin>
     </plugins>
     <resources>
diff --git a/framework/DEPENDENCIES b/framework/src/main/appended-resources/META-INF/DEPENDENCIES
similarity index 81%
rename from framework/DEPENDENCIES
rename to framework/src/main/appended-resources/META-INF/DEPENDENCIES
index 011ab6a..1e5d957 100644
--- a/framework/DEPENDENCIES
+++ b/framework/src/main/appended-resources/META-INF/DEPENDENCIES
@@ -1,4 +1,3 @@
-Apache Felix Framework
 Copyright 2011 The Apache Software Foundation
 
 This software was developed at the Apache Software Foundation
@@ -19,9 +18,5 @@
 Copyright (c) OSGi Alliance (2000, 2009).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
-
 III. License Summary
 - Apache License 2.0
diff --git a/framework/LICENSE b/framework/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from framework/LICENSE
rename to framework/src/main/appended-resources/META-INF/LICENSE
diff --git a/framework/src/main/appended-resources/META-INF/NOTICE b/framework/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..3db2e43
--- /dev/null
+++ b/framework/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,4 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.