diff --git a/tools/Makefile.am b/tools/Makefile.am
index d87dd49db..7c50e4640 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -40,7 +40,7 @@ subst = sed	-e "s!@PACKAGE\@!$(PACKAGE)!g" \
 		-e "s!@LIBS\@!$(LIBS)!g"
 
 krb5-config: krb5-config.in
-	$(subst) $(srcdir)/krb5-config.in > $@.new
+	$(subst) $(srcdir)/krb5-config.in | /bin/sh > $@.new
 	mv $@.new $@
 	chmod +x $@
 
diff --git a/tools/krb5-config.in b/tools/krb5-config.in
index 77652d3bc..640853033 100644
--- a/tools/krb5-config.in
+++ b/tools/krb5-config.in
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+cat <<'EOM'
+#!/bin/sh
 #
 # Copyright (c) 2000 - 2008 Kungliga Tekniska Högskolan
 # (Royal Institute of Technology, Stockholm, Sweden). 
@@ -181,6 +184,8 @@ fi
 # option...  And MIT's krb5-config does include rpath flags.
 #
 # Compatibility with MIT is the winning consideration for now.
+EOM
+
 case "@CANONICAL_HOST@" in
 alpha*-dec-osf*)
   rpath_flag='-Wl,-rpath -Wl,';;
@@ -198,6 +203,10 @@ alpha*-dec-osf*)
 rpath_flag=;;
 esac
 
+echo "rpath_flag='$rpath_flag'"
+
+cat <<'EOM'
+
 if test "$do_libs" = "yes"; then
     deplibs=""
     if test "$lib_gssapi" = yes; then
@@ -254,3 +263,4 @@ if test "$do_cflags" = "yes"; then
 fi
 
 exit 0
+EOM