diff --git a/.gitignore b/.gitignore
index c0bb8dd49..77dd00405 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 local.properties
 bin
 gen
+.settings
diff --git a/build.xml b/build.xml
index 327b46f4d..33344aaf4 100644
--- a/build.xml
+++ b/build.xml
@@ -102,7 +102,7 @@
         <echo>Creating library ${rclib} for remote control
         applications</echo>
 
-	<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
+    <jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
     </target>
 
     <target name="upload" depends="clean,get-version,release">
@@ -159,6 +159,7 @@
         <echo>   bump-version: ant -Dversion-name=3.123</echo>
         <echo>               Bumps the project version to 3.123,tags and commits it</echo>
         <echo>   astyle:     Make K-9's source look like it's supposed to</echo>
+        <echo>   eclipse:    Apply template Eclipse settings</echo>
     </target>
 
 
@@ -182,4 +183,10 @@
     -->
     <setup />
 
+    <target name="eclipse" description="Apply template Eclipse settings">
+        <copy todir=".settings">
+            <fileset dir="tools/eclipse-settings"/>
+        </copy>
+    </target>
+
 </project>
diff --git a/.settings/org.eclipse.core.resources.prefs b/tools/eclipse-settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from .settings/org.eclipse.core.resources.prefs
rename to tools/eclipse-settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/tools/eclipse-settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to tools/eclipse-settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/tools/eclipse-settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.ui.prefs
rename to tools/eclipse-settings/org.eclipse.jdt.ui.prefs