diff --git a/Makefile.am b/Makefile.am
index 7b655b7..7028662 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ dtrace.1 \
 staprun.8
 
 bin_PROGRAMS = staprun
-bin_SCRIPTS = stap-report
+bin_SCRIPTS = stap-report stap-prep
 pkglibexec_PROGRAMS = stapio
 pkglibexec_SCRIPTS = stap-env
 oldinclude_HEADERS = includes/sys/sdt.h
diff --git a/Makefile.in b/Makefile.in
index eaa226e..47866b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,7 +380,7 @@ AM_CXXFLAGS = -Wall -Werror
 man_MANS = stapprobes.3stap stapfuncs.3stap stapvars.3stap \
 	stapex.3stap dtrace.1 staprun.8 $(am__append_2) \
 	$(am__append_4) $(am__append_8)
-bin_SCRIPTS = stap-report $(am__append_3) $(am__append_5) \
+bin_SCRIPTS = stap-report stap-prep $(am__append_3) $(am__append_5) \
 	$(am__append_10)
 pkglibexec_SCRIPTS = stap-env $(am__append_7) $(am__append_11)
 oldinclude_HEADERS = includes/sys/sdt.h
diff --git a/configure b/configure
index 1864214..76bf1cb 100755
--- a/configure
+++ b/configure
@@ -10894,7 +10894,7 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
     "run-stap":F) chmod +x run-stap ;;
     "run-staprun":F) chmod +x run-staprun ;;
     "dtrace":F) chmod +x dtrace ;;
-    "doc/beginners":C) rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite ;;
+    "doc/beginners":C) rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && ln -s $ac_abs_top_srcdir/stap-prep $ac_abs_top_builddir/doc/beginners/build/en-US/stap-prep ;;
 
   esac
 done # for ac_tag
diff --git a/configure.ac b/configure.ac
index 501e480..e6fc22f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -520,7 +520,7 @@ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
 # the src is a directory and not a file.
 AC_CONFIG_FILES([doc/beginners/publican.cfg:doc/SystemTap_Beginners_Guide/publican.cfg.in])
 AC_CONFIG_COMMANDS([doc/beginners],
-                   [rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite])
+                   [rm -f $ac_abs_top_builddir/doc/beginners/en-US $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && mkdir -p $ac_abs_top_builddir/doc/beginners/build/en-US && ln -s $ac_abs_top_srcdir/doc/SystemTap_Beginners_Guide/en-US $ac_abs_top_builddir/doc/beginners/en-US && ln -s $ac_abs_top_srcdir/testsuite $ac_abs_top_builddir/doc/beginners/build/en-US/testsuite && ln -s $ac_abs_top_srcdir/stap-prep $ac_abs_top_builddir/doc/beginners/build/en-US/stap-prep])
 
 AC_OUTPUT
 
diff --git a/systemtap.spec b/systemtap.spec
index d29dac5..a65868a 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -410,6 +410,7 @@ exit 0
 
 %{_bindir}/stap
 %{_bindir}/stap-report
+%{_bindir}/stap-prep
 %{_mandir}/man1/*
 %{_mandir}/man3/*