diff --git a/emacs b/emacs
index b3dba80..8889760 100644
--- a/emacs
+++ b/emacs
@@ -64,8 +64,9 @@
                                 (flyspell-mode 1)
                                 (setq fci-rule-column 80)))
 (add-hook 'python-mode-hook (lambda()
-                              (auto-complete-mode)
                               (elpy-mode)
+                              (elpy-enable)
+                              (setq elpy-rpc-backend "jedi")
                               (highlight-indentation-mode 0)))