diff --git a/macros.ghc b/macros.ghc
index 04166da..7855fc1 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -175,7 +175,7 @@ for i in %{buildroot}%{?_ghcdynlibdir}%{!?_ghcdynlibdir:%{ghcliblib}${subsubdir}
 if [ -x "$i" ]; then\
 echo $i >> %{basepkg}.files\
 else\
-echo $i: not found\
+echo "$i: not found"\
 %if 0%{!-m:1}\
 exit 1\
 %endif\
@@ -241,7 +241,7 @@ done\
 # ghc_delete_rpaths
 %ghc_delete_rpaths\
 %if %{undefined disable_ghc_delete_rpaths}\
-echo "running ghc_delete_rpaths:"\
+echo "deleting rpaths:"\
 if ! type chrpath > /dev/null; then exit 1; fi\
 for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
   if [ -x "$i" ]; then\
@@ -255,7 +255,7 @@ for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q
     esac\
 %endif\
   else\
-    echo "%%ghc_delete_rpath: no $i executable"\
+    echo "%0: no $i executable"\
     exit 1\
   fi\
 done\
@@ -265,7 +265,7 @@ done\
 %ghc_fix_rpath()\
 %if %{undefined disable_ghc_fix_rpath}\
 if ! type chrpath > /dev/null; then exit 1; fi\
-echo "ghc_fix_rpath %*"\
+echo "%0 %*"\
 for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
 for lib in %*; do\
   if [ -x "$i" ]; then\
@@ -294,7 +294,7 @@ for lib in %*; do\
          ;;\
     esac\
   else\
-    echo "%%ghc_fix_rpath: no $i executable"\
+    echo "%0: no $i executable"\
     exit 1\
   fi\
 done\