diff --git a/src/stage2/50_zimfw_doctor.zsh.erb b/src/stage2/50_zimfw_doctor.zsh.erb
new file mode 100644
index 0000000..5054df4
--- /dev/null
+++ b/src/stage2/50_zimfw_doctor.zsh.erb
@@ -0,0 +1,5 @@
+_zimfw_doctor() {
+  local zopt
+  etc="$(grep -El '\bcompinit\b' /etc/zshenv /etc/zshrc /etc/zprofile /etc/zlogin 2> /dev/null)"
+  [ -n "${etc}" ] && _zimfw_print -P "compinit is probably already loaded in your system configuration file ${etc}"
+}
diff --git a/src/stage2/80_zimfw.zsh.erb b/src/stage2/80_zimfw.zsh.erb
index c6f7492..b2c8deb 100644
--- a/src/stage2/80_zimfw.zsh.erb
+++ b/src/stage2/80_zimfw.zsh.erb
@@ -8,6 +8,7 @@ Actions:
   %Bclean-compiled%b  Clean Zsh compiled files
   %Bclean-dumpfile%b  Clean completion dump file
   %Bcompile%b         Compile Zsh files
+  %Bdoctor%b          Check for common issues
   %Bhelp%b            Print this help
   %Binfo%b            Print Zim and system info
   %Binstall%b         Install new modules
@@ -61,6 +62,7 @@ Options:
     clean-compiled) _zimfw_clean_compiled ;;
     clean-dumpfile) _zimfw_clean_dumpfile ;;
     compile) _zimfw_build_login_init && _zimfw_compile ;;
+    doctor) _zimfw_doctor ;;
     help) print -PR ${zusage} ;;
     info) _zimfw_info ;;
     install|update)
diff --git a/zimfw.zsh b/zimfw.zsh
index 1be6cf3..937f2cd 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -289,7 +289,7 @@ _zimfw_doctor() {
 }
 
 _zimfw_info() {
-  print -R 'zimfw version: '${_zversion}' (previous commit is 6129062)'
+  print -R 'zimfw version: '${_zversion}' (previous commit is 6f357b5)'
   print -R 'ZIM_HOME:      '${ZIM_HOME}
   print -R 'Zsh version:   '${ZSH_VERSION}
   print -R 'System info:   '$(command uname -a)