diff --git a/.gitmodules b/.gitmodules
index a52ca47a8..cc25490cd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "spacemacs/extensions/helm-rcirc"]
 	path = spacemacs/extensions/helm-rcirc
 	url = https://github.com/syl20bnr/helm-rcirc
-[submodule "spacemacs/extensions/spray"]
-	path = spacemacs/extensions/spray
-	url = https://github.com/syl20bnr/spray
diff --git a/spacemacs/extensions.el b/spacemacs/extensions.el
index 31e804823..208957091 100644
--- a/spacemacs/extensions.el
+++ b/spacemacs/extensions.el
@@ -25,7 +25,6 @@
     helm-spacemacs
     solarized-theme
     spacemacs-theme
-    spray
     zoom-frm
     ;; hack to be able to wrap built-in emacs modes in an init function
     emacs-builtin-process-menu
@@ -106,29 +105,6 @@
       (add-hook 'kill-emacs-hook 'emacs-save-layout)
       (add-hook 'after-init-hook 'emacs-load-layout t))))
 
-(defun spacemacs/init-spray ()
-  (use-package spray
-    :commands spray-mode
-    :init
-    (progn
-      (defun spacemacs/start-spray ()
-        "Start spray speed reading on current buffer at current point."
-        (interactive)
-        (evil-insert-state)
-        (spray-mode t)
-        (evil-insert-state-cursor-hide))
-      (evil-leader/set-key "asr" 'spacemacs/start-spray)
-
-      (defadvice spray-quit (after spacemacs//quit-spray activate)
-        "Correctly quit spray."
-        (set-default-evil-insert-state-cursor)
-        (evil-normal-state)))
-    :config
-    (progn
-      (define-key spray-mode-map (kbd "h") 'spray-backward-word)
-      (define-key spray-mode-map (kbd "l") 'spray-forward-word)
-      (define-key spray-mode-map (kbd "q") 'spray-quit))))
-
 (defun spacemacs/init-solarized-theme ()
   (use-package solarized
     :init
diff --git a/spacemacs/extensions/spray b/spacemacs/extensions/spray
deleted file mode 160000
index 70bf09465..000000000
--- a/spacemacs/extensions/spray
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 70bf09465080294835afd09780b055d206ff0065
diff --git a/spacemacs/packages.el b/spacemacs/packages.el
index 9c5b15551..9e9d188ef 100644
--- a/spacemacs/packages.el
+++ b/spacemacs/packages.el
@@ -97,6 +97,7 @@
         smartparens
         smooth-scrolling
         spacemacs-theme
+        spray
         subword
         undo-tree
         use-package
@@ -3285,6 +3286,32 @@ one of `l' or `r'."
     (ad-disable-advice 'isearch-repeat 'after 'isearch-smooth-scroll)
     (ad-activate 'isearch-repeat)))
 
+(defun spacemacs/init-spray ()
+  (use-package spray
+    :quelpa (spray
+             :fetcher github
+             :repo "ian-kelling/spray")
+    :commands spray-mode
+    :init
+    (progn
+      (defun spacemacs/start-spray ()
+        "Start spray speed reading on current buffer at current point."
+        (interactive)
+        (evil-insert-state)
+        (spray-mode t)
+        (evil-insert-state-cursor-hide))
+      (evil-leader/set-key "asr" 'spacemacs/start-spray)
+
+      (defadvice spray-quit (after spacemacs//quit-spray activate)
+        "Correctly quit spray."
+        (set-default-evil-insert-state-cursor)
+        (evil-normal-state)))
+    :config
+    (progn
+      (define-key spray-mode-map (kbd "h") 'spray-backward-word)
+      (define-key spray-mode-map (kbd "l") 'spray-forward-word)
+      (define-key spray-mode-map (kbd "q") 'spray-quit))))
+
 (defun spacemacs/init-subword ()
   (unless (version< emacs-version "24.4")
     (use-package subword