diff --git a/src/stage2/50_zimfw_info.zsh.erb b/src/stage2/50_zimfw_info.zsh.erb
index 6a8bf34..8c068b1 100644
--- a/src/stage2/50_zimfw_info.zsh.erb
+++ b/src/stage2/50_zimfw_info.zsh.erb
@@ -1,5 +1,6 @@
 _zimfw_info() {
   print 'Zim version:  <%= version %> (previous commit is <%= `git rev-parse --short HEAD | tr -d '\r\n'` %>)'
-  print -R "Zsh version:  ${ZSH_VERSION}"
-  print -R "System info:  $(command uname -a)"
+  print -R 'ZIM_HOME:     '${ZIM_HOME}
+  print -R 'Zsh version:  '${ZSH_VERSION}
+  print -R 'System info:  '$(command uname -a)
 }
diff --git a/src/stage2/80_zimfw.zsh.erb b/src/stage2/80_zimfw.zsh.erb
index fe801e1..e00bdde 100644
--- a/src/stage2/80_zimfw.zsh.erb
+++ b/src/stage2/80_zimfw.zsh.erb
@@ -3,7 +3,7 @@ zimfw() {
 Usage: %B${0}%b <action> [%B-q%b]
 
 Actions:
-  %Bbuild%b           Build init script
+  %Bbuild%b           Build init.zsh
   %Bclean%b           Clean all (see below)
   %Bclean-modules%b   Clean unused modules
   %Bclean-compiled%b  Clean Zsh compiled files
@@ -12,7 +12,7 @@ Actions:
   %Binfo%b            Print Zim and system info
   %Binstall%b         Install new modules
   %Bupdate%b          Update current modules
-  %Bupgrade%b         Upgrade Zim
+  %Bupgrade%b         Upgrade <%= script_filename %>
 
 Options:
   %B-q%b              Quiet, only outputs errors
@@ -63,7 +63,7 @@ Options:
           fi && \
           _zimfw_source_zimrc && _zimfw_build && _zimfw_compile ${2}
       ;;
-    upgrade) _zimfw_upgrade ;;
+    upgrade) _zimfw_upgrade && _zimfw_compile ;;
     *)
       print -u2 -PR "%F{red}${0}: Unknown action ${1}%f"$'\n'${zusage}
       return 1
diff --git a/zimfw.zsh b/zimfw.zsh
index 38584da..c16c9e2 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -250,9 +250,10 @@ _zimfw_clean_dumpfile() {
 }
 
 _zimfw_info() {
-  print 'Zim version:  1.0.0-SNAPSHOT (previous commit is e81c1d1)'
-  print -R "Zsh version:  ${ZSH_VERSION}"
-  print -R "System info:  $(command uname -a)"
+  print 'Zim version:  1.0.0-SNAPSHOT (previous commit is bccb1fc)'
+  print -R 'ZIM_HOME:     '${ZIM_HOME}
+  print -R 'Zsh version:  '${ZSH_VERSION}
+  print -R 'System info:  '$(command uname -a)
 }
 
 _zimfw_upgrade() {
@@ -287,7 +288,7 @@ zimfw() {
 Usage: %B${0}%b <action> [%B-q%b]
 
 Actions:
-  %Bbuild%b           Build init script
+  %Bbuild%b           Build init.zsh
   %Bclean%b           Clean all (see below)
   %Bclean-modules%b   Clean unused modules
   %Bclean-compiled%b  Clean Zsh compiled files
@@ -296,7 +297,7 @@ Actions:
   %Binfo%b            Print Zim and system info
   %Binstall%b         Install new modules
   %Bupdate%b          Update current modules
-  %Bupgrade%b         Upgrade Zim
+  %Bupgrade%b         Upgrade zimfw.zsh
 
 Options:
   %B-q%b              Quiet, only outputs errors
@@ -427,7 +428,7 @@ fi
           fi && \
           _zimfw_source_zimrc && _zimfw_build && _zimfw_compile ${2}
       ;;
-    upgrade) _zimfw_upgrade ;;
+    upgrade) _zimfw_upgrade && _zimfw_compile ;;
     *)
       print -u2 -PR "%F{red}${0}: Unknown action ${1}%f"$'\n'${zusage}
       return 1