diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc971ab46..9198a53d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Changes
 
 * [#2496](https://github.com/clojure-emacs/cider/issues/2496): Replace CIDER's pprint implementation with nREPL 0.5's built-in pprint support.
+* [#2558](https://github.com/clojure-emacs/cider/pull/2558): Load clj, cljc, & cljs (if cljs repl available) files on `cider-load-all-files` (`C-c C-M-l`). Previously, this only loaded clj files.
 
 ## 0.19.0 (2019-01-01)
 
diff --git a/cider-connection.el b/cider-connection.el
index 570a64b10..a73ccc93a 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -798,7 +798,10 @@ session."
                    (:auto (if (eq cur-type 'multi)
                               '(clj cljs)
                             cur-type))))
-           (repls (cider-repls type 'ensure)))
+           (ensure (cl-case which
+                     (:auto nil)
+                     (t 'ensure)))
+           (repls (cider-repls type ensure)))
       (mapcar function repls))))
 
 ;; REPLs double as connections in CIDER, so it's useful to be able to refer to
diff --git a/cider-eval.el b/cider-eval.el
index 946d55eeb..d0e3d2595 100644
--- a/cider-eval.el
+++ b/cider-eval.el
@@ -1091,7 +1091,7 @@ is done by `cider-load-buffer'."
 Useful when the running nREPL on remote host."
   (interactive "DLoad files beneath directory: ")
   (mapcar #'cider-load-file
-          (directory-files-recursively directory ".clj$")))
+          (directory-files-recursively directory "\\.clj[cs]?$")))
 
 (defalias 'cider-eval-file 'cider-load-file
   "A convenience alias as some people are confused by the load-* names.")