diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000..8a3d05dc
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,5 @@
+;; For Emacs users, this will ensure that Emacs uses two-space indents for all
+;; of the files in the bjoern project.
+((nil . ((indent-tabs-mode . nil)
+		 (tab-width . 2)
+		 (c-basic-offset . 2))))
diff --git a/.gitignore b/.gitignore
index ff75f768..49993708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.pyc
+*~
 build/
 dist/
 MANIFEST