diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000000..3bd83286ec8
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,10 @@
+((nil
+  (indent-tabs-mode . nil)
+  (tab-width . 8)
+  (c-basic-offset . 3)
+  (c-file-style . "stroustrup")
+  (eval . (progn
+	    (c-set-offset 'innamespace '0)
+	    (c-set-offset 'inline-open '0)))
+  )
+ )
diff --git a/.emacs-dirvars b/.emacs-dirvars
deleted file mode 100644
index 33945f91ed6..00000000000
--- a/.emacs-dirvars
+++ /dev/null
@@ -1,10 +0,0 @@
-;; -*- emacs-lisp -*-
-;;
-;; This file is processed by the dirvars emacs package.  Each variable
-;; setting below is performed when this dirvars file is loaded.
-;;
-indent-tabs-mode: nil
-tab-width: 8
-c-basic-offset: 3
-kde-emacs-after-parent-string: ""
-evaluate: (c-set-offset 'inline-open '0)