2006-09-26 David Smith <dsmith@redhat.com>

	* .cvsignore: Changed 'stpd' reference to 'staprun'.
	* INTERNALS: Ditto.
	* buildrun.cxx (run_pass): Ditto.
	* lket.5.in: Ditto.
	* stap.1.in: Ditto.
	* stapruncs.5.in: Ditto.
	* examples/small_demos/demo_script.txt: Ditto.
	* examples/small_demos/sys.stp: Ditto.

	* systemtap.spec.in: Created a new subpackage,
	"systemtap-runtime", that contains staprun.

	* Makefile.am: Renamed 'stpd' to 'staprun' and moved it to
	$(bindir).
	* Makefile.in: Regenerated from Makefile.am.

	* configure.ac: Incremented version number.
	* configure: Regenerated from configure.ac.

14 files changed, 111 insertions, 101 deletions

diff --git a/.cvsignore b/.cvsignore
index 02399fc2..dc1c8f22 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 autom4te.* cscope*out Makefile config.h config.log config.status *.[15]
-.deps loc2c-test stamp-h1 stap stpd stp_check systemtap.spec testresults
+.deps loc2c-test stamp-h1 stap staprun stp_check systemtap.spec testresults
diff --git a/ChangeLog b/ChangeLog
index c52c0d5b..c04bbcd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2006-09-26  David Smith  <dsmith@redhat.com>
+
+	* .cvsignore: Changed 'stpd' reference to 'staprun'.
+	* INTERNALS: Ditto.
+	* buildrun.cxx (run_pass): Ditto.
+	* lket.5.in: Ditto.
+	* stap.1.in: Ditto.
+	* stapruncs.5.in: Ditto.
+	* examples/small_demos/demo_script.txt: Ditto.
+	* examples/small_demos/sys.stp: Ditto.
+	
+	* systemtap.spec.in: Created a new subpackage,
+	"systemtap-runtime", that contains staprun.
+
+	* Makefile.am: Renamed 'stpd' to 'staprun' and moved it to
+	$(bindir).
+	* Makefile.in: Regenerated from Makefile.am.
+
+	* configure.ac: Incremented version number.
+	* configure: Regenerated from configure.ac.
+
 2006-09-22  Tom Zanussi  <zanussi@us.ibm.com>
 	
 	* stp_check.in: Add debugfs mounting.
diff --git a/INTERNALS b/INTERNALS
index 7063cdd3..7fc13d74 100644
--- a/INTERNALS
+++ b/INTERNALS
@@ -121,7 +121,7 @@ Pass 4 - compilation
 
 Pass 5 - running
 
-- run "sudo stpd"
+- run "sudo staprun"
 - clean up temporary directory
 
 - nothing to it!
diff --git a/Makefile.am b/Makefile.am
index a7e73b6e..6dd03d0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,14 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 pkglibexecdir = ${libexecdir}/${PACKAGE}
 
-AM_CPPFLAGS = -DPKGLIBDIR='"$(pkglibexecdir)"' -DPKGDATADIR='"${pkgdatadir}"'
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"'
 
 AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -fexceptions \
 	    -Wall -Werror -Wshadow -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall
 
 dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5
-bin_PROGRAMS = stap
+bin_PROGRAMS = stap staprun
 stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx loc2c.c
@@ -47,11 +47,8 @@ install-elfutils:
 install-exec-local: install-elfutils
 endif
 
-# stpd goes into $libexec/$package, so libexec_PROGRAMS would
-# put it into the wrong location
-pkglibexec_PROGRAMS = stpd
-stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
-stpd_LDADD = -lpthread
+staprun_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
+staprun_LDADD = -lpthread
 
 pkglibexec_SCRIPTS = stp_check
 CLEANFILES += $(pkglibexec_SCRIPTS)
diff --git a/Makefile.in b/Makefile.in
index 9b5b2afb..e0c8081e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,14 +37,13 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-bin_PROGRAMS = stap$(EXEEXT)
+bin_PROGRAMS = stap$(EXEEXT) staprun$(EXEEXT)
 @BUILD_ELFUTILS_TRUE@am__append_1 = -Iinclude-elfutils
 @BUILD_ELFUTILS_TRUE@am__append_2 = -Llib-elfutils -Wl,-rpath-link,lib-elfutils \
 @BUILD_ELFUTILS_TRUE@		-Wl,--enable-new-dtags,-rpath,$(pkglibdir)
 
 @BUILD_ELFUTILS_TRUE@am__append_3 = stamp-elfutils
 @BUILD_ELFUTILS_FALSE@stap_DEPENDENCIES =
-pkglibexec_PROGRAMS = stpd$(EXEEXT)
 noinst_PROGRAMS = loc2c-test$(EXEEXT)
 @BUILD_LKET_B2A_TRUE@am__append_4 = runtime/lket/b2a
 subdir = .
@@ -67,11 +66,9 @@ CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = systemtap.spec stp_check stap.1 stapprobes.5 \
 	stapfuncs.5 stapex.5 lket.5
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \
-	"$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man5dir)"
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_loc2c_test_OBJECTS = loc2c_test-loc2c-test.$(OBJEXT) \
 	loc2c_test-loc2c.$(OBJEXT)
 loc2c_test_OBJECTS = $(am_loc2c_test_OBJECTS)
@@ -82,9 +79,9 @@ am_stap_OBJECTS = stap-main.$(OBJEXT) stap-parse.$(OBJEXT) \
 	stap-translate.$(OBJEXT) stap-tapsets.$(OBJEXT) \
 	stap-buildrun.$(OBJEXT) stap-loc2c.$(OBJEXT)
 stap_OBJECTS = $(am_stap_OBJECTS)
-am_stpd_OBJECTS = stpd.$(OBJEXT) librelay.$(OBJEXT)
-stpd_OBJECTS = $(am_stpd_OBJECTS)
-stpd_DEPENDENCIES =
+am_staprun_OBJECTS = stpd.$(OBJEXT) librelay.$(OBJEXT)
+staprun_OBJECTS = $(am_staprun_OBJECTS)
+staprun_DEPENDENCIES =
 pkglibexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(pkglibexec_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
@@ -99,8 +96,9 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stpd_SOURCES)
-DIST_SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stpd_SOURCES)
+SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(staprun_SOURCES)
+DIST_SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) \
+	$(staprun_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -217,7 +215,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = dist-bzip2
 pkglibexecdir = ${libexecdir}/${PACKAGE}
-AM_CPPFLAGS = -DPKGLIBDIR='"$(pkglibexecdir)"' -DPKGDATADIR='"${pkgdatadir}"'
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"'
 AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -fexceptions \
 	    -Wall -Werror -Wshadow -Wunused -Wformat=2 -W
 
@@ -234,8 +232,8 @@ stap_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
 CLEANFILES = $(am__append_3) $(pkglibexec_SCRIPTS)
 @BUILD_ELFUTILS_TRUE@BUILT_SOURCES = stamp-elfutils
 @BUILD_ELFUTILS_TRUE@stap_DEPENDENCIES = lib-elfutils/libdw.so
-stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
-stpd_LDADD = -lpthread
+staprun_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
+staprun_LDADD = -lpthread
 pkglibexec_SCRIPTS = stp_check
 loc2c_test_SOURCES = loc2c-test.c loc2c.c
 loc2c_test_CPPFLAGS = $(stap_CPPFLAGS)
@@ -345,38 +343,15 @@ clean-binPROGRAMS:
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkglibexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibexecdir)"
-	@list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(pkglibexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(pkglibexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-pkglibexecPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkglibexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(pkglibexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkglibexecdir)/$$f"; \
-	done
-
-clean-pkglibexecPROGRAMS:
-	-test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS)
 loc2c-test$(EXEEXT): $(loc2c_test_OBJECTS) $(loc2c_test_DEPENDENCIES) 
 	@rm -f loc2c-test$(EXEEXT)
 	$(LINK) $(loc2c_test_LDFLAGS) $(loc2c_test_OBJECTS) $(loc2c_test_LDADD) $(LIBS)
 stap$(EXEEXT): $(stap_OBJECTS) $(stap_DEPENDENCIES) 
 	@rm -f stap$(EXEEXT)
 	$(CXXLINK) $(stap_LDFLAGS) $(stap_OBJECTS) $(stap_LDADD) $(LIBS)
-stpd$(EXEEXT): $(stpd_OBJECTS) $(stpd_DEPENDENCIES) 
-	@rm -f stpd$(EXEEXT)
-	$(LINK) $(stpd_LDFLAGS) $(stpd_OBJECTS) $(stpd_LDADD) $(LIBS)
+staprun$(EXEEXT): $(staprun_OBJECTS) $(staprun_DEPENDENCIES) 
+	@rm -f staprun$(EXEEXT)
+	$(LINK) $(staprun_LDFLAGS) $(staprun_OBJECTS) $(staprun_LDADD) $(LIBS)
 install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkglibexecdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibexecdir)"
@@ -986,7 +961,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -1020,7 +995,7 @@ maintainer-clean-generic:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic clean-local \
-	clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am
+	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1042,7 +1017,7 @@ info-am:
 install-data-am: install-data-local install-man
 
 install-exec-am: install-binPROGRAMS install-exec-local \
-	install-pkglibexecPROGRAMS install-pkglibexecSCRIPTS
+	install-pkglibexecSCRIPTS
 
 install-info: install-info-recursive
 
@@ -1070,8 +1045,7 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-local \
-	uninstall-man uninstall-pkglibexecPROGRAMS \
-	uninstall-pkglibexecSCRIPTS
+	uninstall-man uninstall-pkglibexecSCRIPTS
 
 uninstall-info: uninstall-info-recursive
 
@@ -1079,17 +1053,16 @@ uninstall-man: uninstall-man1 uninstall-man5
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
 	check-am clean clean-binPROGRAMS clean-generic clean-local \
-	clean-noinstPROGRAMS clean-pkglibexecPROGRAMS clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-exec-local install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-pkglibexecPROGRAMS install-pkglibexecSCRIPTS \
+	clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \
+	dist dist-all dist-bzip2 dist-gzip dist-hook dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-local install-exec install-exec-am \
+	install-exec-local install-info install-info-am install-man \
+	install-man1 install-man5 install-pkglibexecSCRIPTS \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
@@ -1097,7 +1070,7 @@ uninstall-man: uninstall-man1 uninstall-man5
 	tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-info-am uninstall-local \
 	uninstall-man uninstall-man1 uninstall-man5 \
-	uninstall-pkglibexecPROGRAMS uninstall-pkglibexecSCRIPTS
+	uninstall-pkglibexecSCRIPTS
 
 @BUILD_ELFUTILS_TRUE@stamp-elfutils: config.status
 @BUILD_ELFUTILS_TRUE@	$(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all
diff --git a/buildrun.cxx b/buildrun.cxx
index 1c21d1c5..fe499e1e 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -125,31 +125,31 @@ run_pass (systemtap_session& s)
   struct passwd *pw = getpwuid(getuid());
   string username = string(pw->pw_name);
 
-  // for now, just spawn stpd
-  string stpd_cmd = string("sudo ") 
-    + string(PKGLIBDIR) + "/stpd "
+  // for now, just spawn staprun
+  string staprun_cmd = string("sudo ") 
+    + string(BINDIR) + "/staprun "
     + (s.verbose>1 ? "" : "-q ")
     + "-u " + username + " "
     + (s.output_file.empty() ? "" : "-o " + s.output_file + " ");
   
-  stpd_cmd += "-d " + stringify(getpid()) + " ";
+  staprun_cmd += "-d " + stringify(getpid()) + " ";
   
   if (s.cmd != "")
-    stpd_cmd += "-c \"" + s.cmd + "\" ";
+    staprun_cmd += "-c \"" + s.cmd + "\" ";
   
   if (s.target_pid)
-    stpd_cmd += "-t " + stringify(s.target_pid) + " ";
+    staprun_cmd += "-t " + stringify(s.target_pid) + " ";
   
   if (s.buffer_size)
-    stpd_cmd += "-b " + stringify(s.buffer_size) + " ";
+    staprun_cmd += "-b " + stringify(s.buffer_size) + " ";
   
-  stpd_cmd += s.tmpdir + "/" + s.module_name + ".ko";
+  staprun_cmd += s.tmpdir + "/" + s.module_name + ".ko";
   
-  if (s.verbose>1) clog << "Running " << stpd_cmd << endl;
+  if (s.verbose>1) clog << "Running " << staprun_cmd << endl;
   
   signal (SIGHUP, SIG_IGN);
   signal (SIGINT, SIG_IGN);
-  rc = system (stpd_cmd.c_str ());
+  rc = system (staprun_cmd.c_str ());
 
   return rc;
 }
diff --git a/configure b/configure
index c497becf..21915ad9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for systemtap 0.5.9.
+# Generated by GNU Autoconf 2.59 for systemtap 0.5.10.
 #
 # Report bugs to <systemtap@sources.redhat.com>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='systemtap'
 PACKAGE_TARNAME='systemtap'
-PACKAGE_VERSION='0.5.9'
-PACKAGE_STRING='systemtap 0.5.9'
+PACKAGE_VERSION='0.5.10'
+PACKAGE_STRING='systemtap 0.5.10'
 PACKAGE_BUGREPORT='systemtap@sources.redhat.com'
 
 # Factoring default headers for most tests.
@@ -787,7 +787,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures systemtap 0.5.9 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.5.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -849,7 +849,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of systemtap 0.5.9:";;
+     short | recursive ) echo "Configuration of systemtap 0.5.10:";;
    esac
   cat <<\_ACEOF
 
@@ -980,7 +980,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-systemtap configure 0.5.9
+systemtap configure 0.5.10
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -994,7 +994,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by systemtap $as_me 0.5.9, which was
+It was created by systemtap $as_me 0.5.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1639,7 +1639,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='systemtap'
- VERSION='0.5.9'
+ VERSION='0.5.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5746,7 +5746,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by systemtap $as_me 0.5.9, which was
+This file was extended by systemtap $as_me 0.5.10, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5809,7 +5809,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-systemtap config.status 0.5.9
+systemtap config.status 0.5.10
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 1431086a..8e430c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl configure.ac --- autoconf input file for systemtap
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([systemtap], 0.5.9, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.5.10, systemtap@sources.redhat.com, systemtap)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE
diff --git a/examples/small_demos/demo_script.txt b/examples/small_demos/demo_script.txt
index 40408c4d..48d90c9c 100644
--- a/examples/small_demos/demo_script.txt
+++ b/examples/small_demos/demo_script.txt
@@ -33,7 +33,7 @@ name - the name of the function
 argstr - on function entry, a formatted string containing the arguments
 retstr - on function exit, the return value and possibly error code
 
-In this example, we filter out programs named "stpd" because this is 
+In this example, we filter out programs named "staprun" because this is 
 part of the systemtap infrastructure. (It may be filtered out
 automatically in the future)
 
diff --git a/examples/small_demos/sys.stp b/examples/small_demos/sys.stp
index c25055de..2df20bc3 100755
--- a/examples/small_demos/sys.stp
+++ b/examples/small_demos/sys.stp
@@ -3,12 +3,12 @@
 # print all system calls on the system
 
 probe syscall.* {
-  if (execname() != "stpd")
+  if (execname() != "staprun")
 	printf("%s: %s (%s) = ", execname(), name, argstr)
 }
 
 probe syscall.*.return {
-  if (execname() != "stpd")
+  if (execname() != "staprun")
 	printf("%s\n", retstr)
 }
 
diff --git a/lket.5.in b/lket.5.in
index 82ef2cae..2c2eb444 100644
--- a/lket.5.in
+++ b/lket.5.in
@@ -1197,7 +1197,7 @@ Data format is:
 By default, LKET will log the trace data in binary format.
 
 To get a better performance for binary tracing, the "\-b" option should
-be turned on for stap and thus \-M option has to be added to stop stpd
+be turned on for stap and thus \-M option has to be added to stop staprun
 merging per-cpu files.
 
 You could use the command 
diff --git a/stap.1.in b/stap.1.in
index d0492c2c..7f2e91f3 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -707,7 +707,7 @@ archive the file.
 
 .PP
 In pass 5, the translator invokes the systemtap auxiliary program
-.I stpd
+.I staprun
 program for the given kernel object.  This program arranges to load
 the module then communicates with it, copying trace data from the
 kernel into temporary files, until the user sends an interrupt signal.
@@ -715,7 +715,7 @@ Any run-time error encountered by the probe handlers, such as running
 out of memory, division by zero, exceeding nesting or runtime limits,
 results in a soft error indication.  Soft errors in excess of
 MAXERRORS block of all subsequent probes, and terminate the session.
-Finally, stpd unloads the module, and cleans up.
+Finally, staprun unloads the module, and cleans up.
 
 .SH EXAMPLES
 See the 
@@ -728,11 +728,11 @@ structures and potentially private user information.  It acquires root
 privileges to actually run the kernel objects it builds using the
 .IR sudo
 command applied to the
-.IR stpd
+.IR staprun
 program.  The latter is a part of the Systemtap package, dedicated to
 module loading and unloading (but only in the white zone), and
 kernel-to-user data transfer.  Since 
-.IR stpd
+.IR staprun
 does not perform any additional security checks on the kernel objects
 it is given, it would be unwise for a system administrator to give
 even targeted
@@ -776,7 +776,7 @@ Maximum number of skipped reentrant probes before an exit is triggered.
 
 .PP
 In case something goes wrong with 
-.IR stap " or " stpd
+.IR stap " or " staprun
 after a probe has already started running, one may safely kill both
 user processes, and remove the active probe kernel module with
 .IR rmmod .
@@ -808,7 +808,7 @@ The location of kernel debugging information when packaged into the
 .IR kernel\-debuginfo
 RPM.
 .TP
-/usr/libexec/systemtap/stpd
+/usr/bin/staprun
 The auxiliary program supervising module loading, interaction, and
 unloading.
 
@@ -836,7 +836,7 @@ The
 .IR stap
 translator was written by Frank Ch. Eigler and Graydon Hoare.  The
 kernel-side runtime library and the user-level
-.IR stpd
+.IR staprun
 daemon was written by Martin Hunt and Tom Zanussi.  Contact them
 using the public mailing list:
 .nh
diff --git a/stapfuncs.5.in b/stapfuncs.5.in
index bde9729b..f8891310 100644
--- a/stapfuncs.5.in
+++ b/stapfuncs.5.in
@@ -43,14 +43,14 @@ and integer ("%d").
 .TP
 warn:unknown (msg:string)
 Log the given string to the warning stream.  Append an implicit end-of-line.
-.I stpd
+.I staprun
 prepends the string "WARNING:". 
 
 .TP
 error:unknown (msg:string)
 An error has occurred.  Log the given string to the error stream.
 Append an implicit end-of-line.
-.I stpd
+.I staprun
 prepends the string "ERROR:".
 Block any further execution of statements in this probe.  If the number
 of errors so far exceeds the MAXERRORS parameter, also trigger an 
@@ -61,7 +61,7 @@ exit:unknown ()
 Enqueue a request to shut down the systemtap session.  This does
 .B not
 unwind the current probe handler, nor block new probe handlers.
-.I stpd
+.I staprun
 will shortly respond to the request and initiate an orderly shutdown.
 
 .SS CONVERSIONS
diff --git a/systemtap.spec.in b/systemtap.spec.in
index 7c3825fb..e513d907 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -42,6 +42,7 @@ Requires: glib2 >= 2.0.0
 # or is that kernel-smp-devel?  kernel-hugemem-devel?
 Requires: gcc make
 # Suggest: kernel-debuginfo
+Requires: systemtap-runtime = %{version}-%{release}
 
 %if %{bundled_elfutils}
 Source1: elfutils-%{elfutils_version}.tar.gz
@@ -56,6 +57,18 @@ SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
 of the system.
 
+%package runtime
+Summary: Instrumentation System Runtime
+Group: Development/System
+License: GPL
+URL: http://sourceware.org/systemtap/
+Requires: kernel >= 2.6.9-11
+
+%description runtime
+SystemTap runtime is the runtime component of an instrumentation
+system for systems running Linux 2.6.  Developers can write
+instrumentation to collect data on the operation of the system.
+
 %prep
 %setup -q %{?setup_elfutils}
 
@@ -124,8 +137,14 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/%{name}/lib*.so*
 %endif
 
+%files runtime
+%defattr(-,root,root)
+%{_bindir}/staprun
 
 %changelog
+* Tue Sep 26 2006 David Smith <dsmith@redhat.com> - 0.5.10-1
+- Added 'systemtap-runtime' subpackage.
+
 * Wed Jul 19 2006 Roland McGrath <roland@redhat.com> - 0.5.9-1
 - PRs 2669, 2913