diff --git a/.emacs.d/core.el b/.emacs.d/core.el
index c001d30..43b3e29 100644
--- a/.emacs.d/core.el
+++ b/.emacs.d/core.el
@@ -59,8 +59,11 @@
 (setq package-archives
       '(("gnu"         . "http://elpa.gnu.org/packages/")
         ("org"         . "http://orgmode.org/elpa/")
-        ("melpa"       . "http://melpa.milkbox.net/packages/")
+        ("melpa"       . "http://melpa.org/packages/")
         ("marmalade"   . "https://marmalade-repo.org/packages/")))
+(when (< emacs-major-version 24)
+  ;; For important compatibility libraries like cl-lib
+  (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
 (package-initialize)
 
 (defvar my-packages