diff --git a/.cvsignore b/.cvsignore
index af957e85963..bb36fc7af21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ documents
 DEBIAN
 install.lock
 *.patch
+default.properties
diff --git a/.gitignore b/.gitignore
new file mode 100755
index 00000000000..6daf64aa0ec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+htdocs/conf/conf.php
+htdocs/conf/conf.php.old
+documents/
+custom/
+custom2/
+nbproject
+default.properties
+.settings/
+.buildpath
+.gitmodules
diff --git a/default.properties b/default.properties
deleted file mode 100644
index 7cc29631d3e..00000000000
--- a/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
-# This file must be checked in Version Control Systems.
-# 
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false