diff --git a/llvm/utils/emacs/emacs.el b/llvm/utils/emacs/emacs.el
new file mode 100644
index 000000000000..3f68ea84e18c
--- /dev/null
+++ b/llvm/utils/emacs/emacs.el
@@ -0,0 +1,12 @@
+;; LLVM coding style guidelines in emacs
+;; Maintainer: LLVM Team, http://llvm.cs.uiuc.edu
+;; Modified:   2005-04-24
+
+;; Max 80 cols per line, indent by two spaces, no tabs.
+;; Apparently, this does not affect tabs in Makefiles.
+(custom-set-variables
+  '(fill-column 80)
+  '(c++-indent-level 2)
+  '(c-basic-offset 2)
+  '(indent-tabs-mode nil))
+