diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..14bd9078f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+*.pyc
+.*.swp
+
+_trial_temp/
+logs/
+dbs/
+*.egg
+dist/
+docs/build/
+*.egg-info
+
+cmdclient_config.json
+homeserver.db
+
+.coverage
+htmlcov
+
+demo/*.db
+demo/*.log