diff --git a/ChangeLog b/ChangeLog
index 4ab7ceea..729a539f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-24  Peter Stephenson  <pws@csr.com>
 
+	* 22018: INSTALL, Functions/Newuser/zsh-newuser-install: tweak
+	following suggestions from Bart.
+
 	* 22014: Doc/Zsh/Contrib.yo, Doc/Zsh/zle.yo,
 	Functions/Zle/.distfiles, Functions/Zle/insert-unicode-char,
 	Src/Zle/iwidgets.list, Src/Zle/zle.h, Src/Zle/zle_main.c,
diff --git a/Functions/Newuser/zsh-newuser-install b/Functions/Newuser/zsh-newuser-install
index e042af08..d8fd437e 100644
--- a/Functions/Newuser/zsh-newuser-install
+++ b/Functions/Newuser/zsh-newuser-install
@@ -61,8 +61,8 @@ install_state[completion]=Recommended
 trap 'save=0' HUP INT QUIT
 
 # Substitute an initial ~ for human consumption.
-if [[ $zd = $HOME ]]; then
-  zdmsg="~"
+if [[ $zd = $HOME(#b)(|/*) ]]; then
+  zdmsg="~$match[1]"
 else
   zdmsg=$zd
 fi
diff --git a/INSTALL b/INSTALL
index fb461cfe..855164f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -243,7 +243,7 @@ scripts/newuser in the shared library area (by default
 /usr/local/share/zsh/<VERSION>/scripts/newuser).  This feature can be
 turned off simply by removing this script.  The module can be removed
 entirely from the configured shell by editing the line starting
-"name=zsh/newuser" int the config.modules file, which is generated in the
+"name=zsh/newuser" in the config.modules file, which is generated in the
 top level distribution directory during configuration: change the line to
 include "link=no auto=no".