diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 000000000..b66c0e2fd
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,5 @@
+# $Id$
+
+include $(top_srcdir)/Makefile.am.common
+
+bin_SCRIPTS = krb5-config
diff --git a/tools/krb5-config.in b/tools/krb5-config.in
new file mode 100755
index 000000000..4c1308037
--- /dev/null
+++ b/tools/krb5-config.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+# $Id$
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+for i in $*; do
+  case $i in
+  --help)
+    echo "usage: $0 [--ldflags] [--cflags]"
+    exit 0
+    ;;
+  --version)
+    echo "@PACKAGE@ @VERSION@"
+    echo "$Id$"
+    exit 0
+    ;;
+  --ldflags)
+    echo "-L${libdir} -lkrb5 -lasn1 -ldes -lroken @LIB_crypt@ @LIB_dbopen@ @LIBS@"
+    exit 0
+    ;;
+  --cflags)
+    echo "-I${includedir}"
+    exit 0
+    ;;
+  *)
+    echo "unknown option: $i"
+    exit 1
+    ;;
+  esac
+done
+exit 0