diff --git a/.classpath b/.classpath
index 50d94e27d..609aa00eb 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android Library 1.1"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.project b/.project
index 7c0afa57a..00d97a63a 100644
--- a/.project
+++ b/.project
@@ -30,11 +30,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>build.xml</name>
-			<type>1</type>
-			<location>/home/bpellin/src/workspace/KeePassDroid/build.xml</location>
-		</link>
-	</linkedResources>
 </projectDescription>
diff --git a/gen/com/android/keepass/.gitignore b/gen/com/android/keepass/.gitignore
deleted file mode 100644
index 48c029696..000000000
--- a/gen/com/android/keepass/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-R.java
diff --git a/tests/.classpath b/tests/.classpath
index ce541144d..bccd9e1ed 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/KeePassDroid"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Android Library 1.1-2"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/junit4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/gen/com/android/keepass/tests/.gitignore b/tests/gen/com/android/keepass/tests/.gitignore
deleted file mode 100644
index 48c029696..000000000
--- a/tests/gen/com/android/keepass/tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-R.java