diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9b07bbb0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+cache.properties
+.DS_Store
+
+islandora.info~
+
+includes/solution_packs.inc~
+
+islandora.module~
+
+tests/islandora_authtokens.test~
+
+tests/islandora_basic_collection_manage_permissions.test~
+
+tests/islandora_manage_perm.test~
+
+tests/islandora_manage_permissions.test~
+
+tests/islandora_web_test_case.inc~
+
+theme/islandora-object.tpl.php~
+
+theme/islandora.theme.inc~
+
+tests/test_config.ini
+