diff --git a/vimrc b/vimrc
index 67dba49..c0a9306 100644
--- a/vimrc
+++ b/vimrc
@@ -152,8 +152,9 @@ map <F7> :ls!<CR>:buffer<Space>
 vnoremap < <gv
 vnoremap > >gv
 "[Improve up/down movement on wrapped lines]"
-nnoremap j gj
-nnoremap k gk
+"[If preceded by a count, jump actual lines. Also if > 5, save to jumplist]"
+nnoremap <expr> j v:count ? (v:count > 5 ? "m'" . v:count : '') . 'j' : 'gj'
+nnoremap <expr> k v:count ? (v:count > 5 ? "m'" . v:count : '') . 'k' : 'gk'
 " nnoremap <Down> gj
 " nnoremap <Up> gk
 " vnoremap <Down> gj