diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 970024f..97966c6 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -143,6 +143,8 @@ There are two things you can do about this warning:
 ;; Default modes
 ;;--------------------------------------------------------------------------------------
 
+(require 'use-package)
+
 (ivy-mode 1)
 
 ;; Enable column numbers
@@ -183,6 +185,11 @@ There are two things you can do about this warning:
 ;; Enable semantic for language-aware editing commands
 (setq semantic-mode 't)
 
+;; For Python enable Elpy.
+(use-package elpy
+	     :ensure t
+	     :init (elpy-enable))
+
 ;;--------------------------------------------------------------------------------------
 ;; Save hooks
 ;;--------------------------------------------------------------------------------------
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 8975108..e5242b0 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -32,7 +32,7 @@
                       nasm-mode
                       paredit
                       protobuf-mode
-                      python-mode
+                      elpy
                       yaml-mode
 		      slime
                       ;;;;;;;;;;;;;;;;;;;;
@@ -74,6 +74,10 @@
 		      counsel-gtags
 		      rtags
 		      company-rtags
+
+		      ;;General
+		      use-package
+		      
                       ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 		      )