diff --git a/doc/tips/emacs_integration.mdwn b/doc/tips/emacs_integration.mdwn
new file mode 100644
index 0000000000..a607642c88
--- /dev/null
+++ b/doc/tips/emacs_integration.mdwn
@@ -0,0 +1,7 @@
+bergey has developed an emacs mode for browsing git-annex repositories,
+dired style.
+
+<https://gitorious.org/emacs-contrib/annex-mode>
+
+Locally available files are colored differently, and pressing g runs
+`git annex get` on the file at point.