diff --git a/.vimrc b/.vimrc
index 96688c6..5033c74 100644
--- a/.vimrc
+++ b/.vimrc
@@ -144,6 +144,12 @@ if has("autocmd")
     " Set filetype tab settings
     autocmd FileType python,doctest set ai ts=4 sw=4 sts=4 et
     autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+
+    " ShellCheck settings
+    autocmd FileType sh set makeprg=shellcheck\ -f\ gcc\ %
+    autocmd FileType sh au BufWritePost * :silent make | redraw!
+    autocmd FileType sh au QuickFixCmdPost [^l]* nested cwindow
+    autocmd FileType sh au QuickFixCmdPost    l* nested lwindow
 endif
 
 
diff --git a/salt/pillars/packages.sls b/salt/pillars/packages.sls
index a00c054..48a5972 100644
--- a/salt/pillars/packages.sls
+++ b/salt/pillars/packages.sls
@@ -17,3 +17,4 @@ packages:
   pattern:devel_basis: { status: installed }
   wireguard-tools: { status: installed }
   myspell-sv_SE: { status: installed }
+  ShellCheck:   { status: installed }