diff --git a/tools/krb5-config.in b/tools/krb5-config.in
index 6aedc2c61..ac8220fd4 100755
--- a/tools/krb5-config.in
+++ b/tools/krb5-config.in
@@ -4,6 +4,8 @@
 do_libs=no
 do_cflags=no
 do_usage=no
+print_prefix=no
+print_exec_prefix=no
 library=krb5
 
 if test $# -eq 0; then
@@ -25,9 +27,15 @@ for i in $*; do
   --prefix=*)
     prefix=`echo $i | sed 's/^--prefix=//'`
     ;;
+  --prefix)
+    print_prefix=yes
+    ;;
   --exec-prefix=*)
     exec_prefix=`echo $i | sed 's/^--exec-prefix=//'`
     ;;
+  --exec-prefix)
+    print_exec_prefix=yes
+    ;;
   --libs)
     do_libs=yes
     ;;
@@ -55,7 +63,7 @@ done
 
 if test "$do_usage" = "yes"; then
     echo "usage: $0 [options] [libraries]"
-    echo "options: [--prefix=dir] [--exec-prefix=dir] [--libs] [--cflags]"
+    echo "options: [--prefix[=dir]] [--exec-prefix[=dir]] [--libs] [--cflags]"
     echo "libraries: krb5 gssapi kadm-client kadm-server"
     exit $usage_exit
 fi
@@ -70,6 +78,14 @@ fi
 libdir=@libdir@
 includedir=@includedir@
 
+if test "$print_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$print_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
 if test "$do_libs" = "yes"; then
     echo -n "-L${libdir}"
     case $library in