diff --git a/systemtap-docs.changes b/systemtap-docs.changes
index d4a8601..5a19578 100644
--- a/systemtap-docs.changes
+++ b/systemtap-docs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 21 08:47:33 CEST 2009 - tiwai@suse.de
+
+- corrected to use libexecdir
+- fix summary and description
+
 -------------------------------------------------------------------
 Thu Jun 18 12:46:08 CEST 2009 - tiwai@suse.de
 
diff --git a/systemtap-docs.spec b/systemtap-docs.spec
index be3c4a0..da7781f 100644
--- a/systemtap-docs.spec
+++ b/systemtap-docs.spec
@@ -29,8 +29,8 @@ BuildRequires:  latex2html
 %define use_snapshot	0
 License:        GPL v2 or later
 Version:        0.9.8
-Release:        1
-Summary:        Instrumentation System
+Release:        2
+Summary:        Documents and examples for systemtap
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
 %if %use_snapshot
@@ -47,8 +47,7 @@ BuildArch:      noarch
 
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
-Developers can write instrumentation to collect data on the operation
-of the system.
+This package contains the documents and examples for systemtap.
 
 
 
@@ -85,7 +84,7 @@ export MKDIR_P="mkdir -p"
 cp README AUTHORS NEWS COPYING $RPM_BUILD_ROOT%{_docdir}/systemtap/
 # remove binaries and runtime stuff
 rm -rf $RPM_BUILD_ROOT%{_bindir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}
+rm -rf $RPM_BUILD_ROOT%{_libexecdir}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/systemtap
 rm -rf $RPM_BUILD_ROOT%{_includedir}
 # these man pages are in each sub package
@@ -101,203 +100,3 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
-* Thu Jun 18 2009 tiwai@suse.de
-- change to noarch
-* Tue Jun 16 2009 tiwai@suse.de
-- updated to version 0.9.8:
-  * Module signing support
-  * Debuginfo suggestions when a script fails
-  * Using %%M in print formats for hex dumps can now print entire
-  buffers
-  * Dwarfless syscalls: The nd_syscalls tapset is now available to
-  probe system calls without requiring kernel debug info.
-  * sid() returns the session ID of the current process
-  * stringat() indexes a single character from a string.
-  * New script examples
-* Fri May 22 2009 tiwai@suse.de
-- add missing examples installation in docs subpackage
-* Wed May 20 2009 tiwai@suse.de
-- split docs and examples to docs subpackage and generate from its
-  own spec file to cut off the dependency loop
-* Fri May 15 2009 tiwai@suse.de
-- split to several subpackages, systemtap-runtime, -client, -server
-  and -sdt-devel (bnc#503088).
-* Fri May 08 2009 tiwai@suse.de
-- updated to released version 0.9.7:
-  * Lots of fixes, improvements, see NEWS file for details
-* Thu Feb 19 2009 tiwai@suse.de
-- updated to systemtap snashot 20090214:
-  * Version bump to 0.8
-  * Bunch of fixes and updates, see ChangeLog
-  * Fix for recent 2.6.29 kernels
-- fixed doc build, using fop instead of direct xmlto pdf
-* Thu Feb 12 2009 tiwai@suse.de
-- backport the blacklist additions from upstream to fix possible
-  system crash (bnc#459387, bnc#473277)
-* Thu Feb 05 2009 tiwai@suse.de
-- Backport tapset/signal.stp to fix the signal probe problem
-  (bnc#468321)
-* Tue Feb 03 2009 tiwai@suse.de
-- Fix debugpath.exp with $SYSTEMTAP_DEBUGINFO_PATH (bnc#471811)
-* Thu Jan 29 2009 tiwai@suse.de
-- Fix procfs dir_entry count warning (bnc#470526)
-- Improve the parsing of lineno checks (bnc#468247)
-* Thu Jan 15 2009 tiwai@suse.de
-- Fix quoting in Tcl scripts (bnc#461588)
-* Mon Jan 12 2009 tiwai@suse.de
-- Fix syntax errors with Tcl send_log (bnc#460886)
-* Thu Dec 18 2008 tiwai@suse.de
-- Fix stap failures with signal tapsets (bnc#459387)
-* Tue Dec 16 2008 tiwai@suse.de
-- Fix dependency on libebl1 (bnc#448331, #445783)
-- Fix stap for 2.6.28 kernels
-* Fri Dec 12 2008 tiwai@suse.de
-- Don't assert of dwarf_getsrcfiles().  This hits recent SUSE
-  kernels (bnc#455992)
-- Backport fix patches for stap-*-server scripts to run with
-  netcat (bnc#446686)
-* Mon Dec 08 2008 tiwai@suse.de
-- fixed unresolved path in man pages (bnc#457217)
-- fixed build for old distros on OBS
-* Thu Dec 04 2008 tiwai@suse.de
-- fix ioblock.stp for SUSE 2.6.27.x kernel (bnc#456175)
-* Fri Nov 21 2008 tiwai@suse.de
-- Add the bound check of parameters to fix segfault (bnc#447551)
-* Tue Nov 04 2008 tiwai@suse.de
-- Fix systemtap assertion with CONFIG_RELOCATABLE (bnc#440351)
-* Thu Sep 11 2008 tiwai@suse.de
-- updated to snapshot 20080906
-  * Fix / clean up autotools stuff
-  * Ugly workaround for 2.6.27 and later kernel
-  * stap-server updates
-  * Lots of small fixes
-* Tue Aug 12 2008 tiwai@suse.de
-- updated to snapshot 20080809
-  * bump to 0.7.1
-  * tutorials
-  * examples
-  * i386-fix merged
-  * previous patches are all merged in
-- add latex2html to buildrequires for generating documents
-* Fri Jun 20 2008 tiwai@suse.de
-- fix run on i386 (bnc#401970)
-- don't include obsolete linux/compile.h.
-* Wed Jun 18 2008 tiwai@suse.de
-- updated to snapshot 20080614:
-  * bump to version 0.7, man page updates, misc fixes
-  see ChangeLog for details
-* Fri Mar 14 2008 tiwai@suse.de
-- updated to snapshot 20080308:
-  * configure fixes, compile option changes
-  * fixes for 2.6.25 kernel
-* Wed Jan 30 2008 tiwai@suse.de
-- updated to snapshot 20080126
-  * fix configure and automake stuff
-  * gcc 4.3 fix is included
-  * ufprobes fixes, improvements
-  * reorganized probe condition implementation.
-* Fri Jan 11 2008 tiwai@suse.de
-- updated to snapshot 20080105
-- fixed build of the snapshot with gcc 4.3
-* Mon Nov 19 2007 tiwai@suse.de
-- enable gcc-4.3 patch (yes, we use only gcc4.3 now)
-- updated to snapshot 20071117
-* Thu Oct 25 2007 tiwai@suse.de
-- disable gcc-4.3 fix again since it breaks older gccs...
-* Wed Oct 24 2007 tiwai@suse.de
-- fix build with gcc 4.3
-* Mon Oct 22 2007 tiwai@suse.de
-- updated to snapshot 20071020:
-  * bump up version 0.6
-  * bunch of updates and fixes, see ChangeLog
-* Tue Aug 14 2007 tiwai@suse.de
-- updated to snapshot 20070811:
-  * Updated -m MODNAME usage
-  * Rework on line editing functions
-* Mon Jul 16 2007 tiwai@suse.de
-- updated to snapshot 20070714:
-  * configure fix for sqlite
-  * support for crash extension module
-  * new enum for type column in coverage_element
-* Wed Jul 04 2007 tiwai@suse.de
-- updated to snapshot 20070630:
-  * auto-tools fixes, sqlite3 requirement
-- add sqlite-devel and glib2-devel to buildrequires
-* Wed Jun 06 2007 tiwai@suse.de
-- updated to snapshot 20070602:
-  * fix for gcc4.3
-  * minor fixes in elaborate.*
-- include the snapshot date into version string
-- clean up spec file
-* Tue May 22 2007 tiwai@suse.de
-- updated to snapshot 20070519:
-  * Updated temporary handlings
-  * Autoconf tweaks
-  * Performance improvements with const and temporary handlings
-  * Removed do_write and do_read probles, added aio_write,
-  aio_read, writev and readv probes.
-* Mon May 21 2007 tiwai@suse.de
-- use the external elfutils packages.
-* Tue Apr 24 2007 tiwai@suse.de
-- updated to snapshot 20070421 and elfutils-0.127:
-  * minor compile warning fixes
-  * add interruptible parameter
-  * improvement on documents
-  * fix for debugfs and relayfs mounts
-  * see ChangeLog for other changes
-* Mon Mar 19 2007 tiwai@suse.de
-- updated to snapshot 20070317:
-  including all fix patches
-* Thu Mar 08 2007 tiwai@suse.de
-- fix the handling of function arguments in more generic way
-  (#245310, #252311)
-  added a new option -P to switch the prologue-search behavior
-* Wed Mar 07 2007 tiwai@suse.de
-- fix misalignment of exception table entry on s390x (#249576)
-* Mon Feb 26 2007 tiwai@suse.de
-- fix crash with large H value in hist_linear() (#248430)
-* Fri Feb 23 2007 tiwai@suse.de
-- fix mmap syscall on s390x (#248110)
-* Thu Feb 15 2007 tiwai@suse.de
-- fix a wrong name of store_deref definition (#245544)
-* Wed Feb 14 2007 tiwai@suse.de
-- fix the handling of function arguments on s390x (#245310)
-* Tue Feb 06 2007 tiwai@suse.de
-- update to snapshot 20070203, bugfixes including:
-  * add missing sockets tapset support (#239346)
-  * fix the array membership (#242481)
-* Wed Jan 31 2007 tiwai@suse.de
-- turn on Autoprov again to fix broken dependency.
-* Tue Jan 30 2007 tiwai@suse.de
-- update to snapshot 20070120 and elfutils-0.125 to fix major
-  bugs (#238710):
-  * fixed libdw known bugs in elfutils 0.124
-  * add the missing support of tapsetr/errno.stp for s390x
-  * fix conditionals in syscall tapset for s390x
-  * new macros to safely read/write values from kernel pointers
-  * fix the non-standard C behavior to handle NULL in an array
-  * fixed support for benchmarking mode with off-line code
-  * added support to allow user to use array size declarations
-  * reduce number of calls to stp_module_relocate within $tvar
-  functions
-* Tue Jan 09 2007 tiwai@suse.de
-- updated to the recent snapshot version (FATE 301670).
-  * fix cache bugs
-  * auto-tools fixes
-  * probe registartion rework
-  * allow negative numeric literals
-  * bugfixes/optmizations
-- elfutls 1.2.4
-  removed codes with problematic license in elfutils (#232894)
-* Thu Aug 24 2006 tiwai@suse.de
-- update elfutils to 1.2.3, including vmlinux.debuginfo fix.
-* Thu Aug 24 2006 tiwai@suse.de
-- fix the auto-lookup of vmlinux debuginfo for SUSE systems
-- fix the stp compilation with 2.6.18 kernel
-* Wed Aug 09 2006 tiwai@suse.de
-- updated to latest snapshot (version 0.5.8)
-  with elfutils-1.2.2.
-* Tue Apr 18 2006 mason@suse.de
-- Update to latest snapshot
-* Sun Apr 09 2006 mason@suse.de
-- created package
diff --git a/systemtap.changes b/systemtap.changes
index 3d5d61a..782616d 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 21 08:47:11 CEST 2009 - tiwai@suse.de
+
+- corrected to use libexecdir
+- fix summary and description
+
 -------------------------------------------------------------------
 Tue Jun 16 16:24:28 CEST 2009 - tiwai@suse.de
 
diff --git a/systemtap.spec b/systemtap.spec
index 8e05011..fd315fa 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -24,8 +24,8 @@ BuildRequires:  mozilla-nspr-devel mozilla-nss-devel mozilla-nss-tools
 %define use_snapshot	0
 License:        GPL v2 or later
 Version:        0.9.8
-Release:        1
-Summary:        Documents and examples for systemtap
+Release:        2
+Summary:        Instrumentation System
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
 # Requires: kernel-source gcc make
@@ -45,7 +45,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
-This package contains the documents and examples for systemtap.
+Developers can write instrumentation to collect data on the operation
+of the system.
 
 
 
@@ -174,7 +175,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_bindir}/staprun
 %{_bindir}/stap-report
-%{_libdir}/systemtap
+%{_libexecdir}/systemtap
 %{_mandir}/man8/staprun.*
 
 %files client
@@ -204,199 +205,3 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/sys/*.h
 
 %changelog
-* Tue Jun 16 2009 tiwai@suse.de
-- updated to version 0.9.8:
-  * Module signing support
-  * Debuginfo suggestions when a script fails
-  * Using %%M in print formats for hex dumps can now print entire
-  buffers
-  * Dwarfless syscalls: The nd_syscalls tapset is now available to
-  probe system calls without requiring kernel debug info.
-  * sid() returns the session ID of the current process
-  * stringat() indexes a single character from a string.
-  * New script examples
-* Wed May 20 2009 tiwai@suse.de
-- split docs and examples to docs subpackage and generate from its
-  own spec file to cut off the dependency loop
-* Fri May 15 2009 tiwai@suse.de
-- split to several subpackages, systemtap-runtime, -client, -server
-  and -sdt-devel (bnc#503088).
-* Fri May 08 2009 tiwai@suse.de
-- updated to released version 0.9.7:
-  * Lots of fixes, improvements, see NEWS file for details
-* Thu Feb 19 2009 tiwai@suse.de
-- updated to systemtap snashot 20090214:
-  * Version bump to 0.8
-  * Bunch of fixes and updates, see ChangeLog
-  * Fix for recent 2.6.29 kernels
-- fixed doc build, using fop instead of direct xmlto pdf
-* Thu Feb 12 2009 tiwai@suse.de
-- backport the blacklist additions from upstream to fix possible
-  system crash (bnc#459387, bnc#473277)
-* Thu Feb 05 2009 tiwai@suse.de
-- Backport tapset/signal.stp to fix the signal probe problem
-  (bnc#468321)
-* Tue Feb 03 2009 tiwai@suse.de
-- Fix debugpath.exp with $SYSTEMTAP_DEBUGINFO_PATH (bnc#471811)
-* Thu Jan 29 2009 tiwai@suse.de
-- Fix procfs dir_entry count warning (bnc#470526)
-- Improve the parsing of lineno checks (bnc#468247)
-* Thu Jan 15 2009 tiwai@suse.de
-- Fix quoting in Tcl scripts (bnc#461588)
-* Mon Jan 12 2009 tiwai@suse.de
-- Fix syntax errors with Tcl send_log (bnc#460886)
-* Thu Dec 18 2008 tiwai@suse.de
-- Fix stap failures with signal tapsets (bnc#459387)
-* Tue Dec 16 2008 tiwai@suse.de
-- Fix dependency on libebl1 (bnc#448331, #445783)
-- Fix stap for 2.6.28 kernels
-* Fri Dec 12 2008 tiwai@suse.de
-- Don't assert of dwarf_getsrcfiles().  This hits recent SUSE
-  kernels (bnc#455992)
-- Backport fix patches for stap-*-server scripts to run with
-  netcat (bnc#446686)
-* Mon Dec 08 2008 tiwai@suse.de
-- fixed unresolved path in man pages (bnc#457217)
-- fixed build for old distros on OBS
-* Thu Dec 04 2008 tiwai@suse.de
-- fix ioblock.stp for SUSE 2.6.27.x kernel (bnc#456175)
-* Fri Nov 21 2008 tiwai@suse.de
-- Add the bound check of parameters to fix segfault (bnc#447551)
-* Tue Nov 04 2008 tiwai@suse.de
-- Fix systemtap assertion with CONFIG_RELOCATABLE (bnc#440351)
-* Thu Sep 11 2008 tiwai@suse.de
-- updated to snapshot 20080906
-  * Fix / clean up autotools stuff
-  * Ugly workaround for 2.6.27 and later kernel
-  * stap-server updates
-  * Lots of small fixes
-* Tue Aug 12 2008 tiwai@suse.de
-- updated to snapshot 20080809
-  * bump to 0.7.1
-  * tutorials
-  * examples
-  * i386-fix merged
-  * previous patches are all merged in
-- add latex2html to buildrequires for generating documents
-* Fri Jun 20 2008 tiwai@suse.de
-- fix run on i386 (bnc#401970)
-- don't include obsolete linux/compile.h.
-* Wed Jun 18 2008 tiwai@suse.de
-- updated to snapshot 20080614:
-  * bump to version 0.7, man page updates, misc fixes
-  see ChangeLog for details
-* Fri Mar 14 2008 tiwai@suse.de
-- updated to snapshot 20080308:
-  * configure fixes, compile option changes
-  * fixes for 2.6.25 kernel
-* Wed Jan 30 2008 tiwai@suse.de
-- updated to snapshot 20080126
-  * fix configure and automake stuff
-  * gcc 4.3 fix is included
-  * ufprobes fixes, improvements
-  * reorganized probe condition implementation.
-* Fri Jan 11 2008 tiwai@suse.de
-- updated to snapshot 20080105
-- fixed build of the snapshot with gcc 4.3
-* Mon Nov 19 2007 tiwai@suse.de
-- enable gcc-4.3 patch (yes, we use only gcc4.3 now)
-- updated to snapshot 20071117
-* Thu Oct 25 2007 tiwai@suse.de
-- disable gcc-4.3 fix again since it breaks older gccs...
-* Wed Oct 24 2007 tiwai@suse.de
-- fix build with gcc 4.3
-* Mon Oct 22 2007 tiwai@suse.de
-- updated to snapshot 20071020:
-  * bump up version 0.6
-  * bunch of updates and fixes, see ChangeLog
-* Tue Aug 14 2007 tiwai@suse.de
-- updated to snapshot 20070811:
-  * Updated -m MODNAME usage
-  * Rework on line editing functions
-* Mon Jul 16 2007 tiwai@suse.de
-- updated to snapshot 20070714:
-  * configure fix for sqlite
-  * support for crash extension module
-  * new enum for type column in coverage_element
-* Wed Jul 04 2007 tiwai@suse.de
-- updated to snapshot 20070630:
-  * auto-tools fixes, sqlite3 requirement
-- add sqlite-devel and glib2-devel to buildrequires
-* Wed Jun 06 2007 tiwai@suse.de
-- updated to snapshot 20070602:
-  * fix for gcc4.3
-  * minor fixes in elaborate.*
-- include the snapshot date into version string
-- clean up spec file
-* Tue May 22 2007 tiwai@suse.de
-- updated to snapshot 20070519:
-  * Updated temporary handlings
-  * Autoconf tweaks
-  * Performance improvements with const and temporary handlings
-  * Removed do_write and do_read probles, added aio_write,
-  aio_read, writev and readv probes.
-* Mon May 21 2007 tiwai@suse.de
-- use the external elfutils packages.
-* Tue Apr 24 2007 tiwai@suse.de
-- updated to snapshot 20070421 and elfutils-0.127:
-  * minor compile warning fixes
-  * add interruptible parameter
-  * improvement on documents
-  * fix for debugfs and relayfs mounts
-  * see ChangeLog for other changes
-* Mon Mar 19 2007 tiwai@suse.de
-- updated to snapshot 20070317:
-  including all fix patches
-* Thu Mar 08 2007 tiwai@suse.de
-- fix the handling of function arguments in more generic way
-  (#245310, #252311)
-  added a new option -P to switch the prologue-search behavior
-* Wed Mar 07 2007 tiwai@suse.de
-- fix misalignment of exception table entry on s390x (#249576)
-* Mon Feb 26 2007 tiwai@suse.de
-- fix crash with large H value in hist_linear() (#248430)
-* Fri Feb 23 2007 tiwai@suse.de
-- fix mmap syscall on s390x (#248110)
-* Thu Feb 15 2007 tiwai@suse.de
-- fix a wrong name of store_deref definition (#245544)
-* Wed Feb 14 2007 tiwai@suse.de
-- fix the handling of function arguments on s390x (#245310)
-* Tue Feb 06 2007 tiwai@suse.de
-- update to snapshot 20070203, bugfixes including:
-  * add missing sockets tapset support (#239346)
-  * fix the array membership (#242481)
-* Wed Jan 31 2007 tiwai@suse.de
-- turn on Autoprov again to fix broken dependency.
-* Tue Jan 30 2007 tiwai@suse.de
-- update to snapshot 20070120 and elfutils-0.125 to fix major
-  bugs (#238710):
-  * fixed libdw known bugs in elfutils 0.124
-  * add the missing support of tapsetr/errno.stp for s390x
-  * fix conditionals in syscall tapset for s390x
-  * new macros to safely read/write values from kernel pointers
-  * fix the non-standard C behavior to handle NULL in an array
-  * fixed support for benchmarking mode with off-line code
-  * added support to allow user to use array size declarations
-  * reduce number of calls to stp_module_relocate within $tvar
-  functions
-* Tue Jan 09 2007 tiwai@suse.de
-- updated to the recent snapshot version (FATE 301670).
-  * fix cache bugs
-  * auto-tools fixes
-  * probe registartion rework
-  * allow negative numeric literals
-  * bugfixes/optmizations
-- elfutls 1.2.4
-  removed codes with problematic license in elfutils (#232894)
-* Thu Aug 24 2006 tiwai@suse.de
-- update elfutils to 1.2.3, including vmlinux.debuginfo fix.
-* Thu Aug 24 2006 tiwai@suse.de
-- fix the auto-lookup of vmlinux debuginfo for SUSE systems
-- fix the stp compilation with 2.6.18 kernel
-* Wed Aug 09 2006 tiwai@suse.de
-- updated to latest snapshot (version 0.5.8)
-  with elfutils-1.2.2.
-* Tue Apr 18 2006 mason@suse.de
-- Update to latest snapshot
-* Sun Apr 09 2006 mason@suse.de
-- created package