diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48fa62a7fd..424047111d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### New features
 
-* Enable `nlinum-mode` by default. Can be disabled by setting `prelude-minimalistic-ui` to `t`.
+* Enable `nlinum-mode` or `display-line-numbers-mode` by default. Can be disabled by setting `prelude-minimalistic-ui` to `t`.
 * Enable site-wide installation for Prelude.
 * Auto-installs `julia-mode` if needed.
 * Auto-install `adoc-mode` for AsciiDoc files.
diff --git a/core/prelude-ui.el b/core/prelude-ui.el
index 032d3dde93..fed75fadd2 100644
--- a/core/prelude-ui.el
+++ b/core/prelude-ui.el
@@ -62,8 +62,11 @@
 ;; show line numbers at the beginning of each line
 (unless prelude-minimalistic-ui
   ;; there's a built-in linum-mode, but we're using
-  ;; nlinum-mode, as it's supposedly faster
-  (global-nlinum-mode t))
+  ;; display-line-numbers-mode or nlinum-mode,
+  ;; as it's supposedly faster
+  (if (fboundp 'global-display-line-numbers-mode)
+      (global-display-line-numbers-mode)
+    (global-nlinum-mode t)))
 
 ;; enable y/n answers
 (fset 'yes-or-no-p 'y-or-n-p)