--- stapex.5.in-dist	2008-08-16 16:27:08.000000000 +0200
+++ stapex.5.in	2008-08-18 18:01:39.000000000 +0200
@@ -109,12 +109,12 @@
 .SH MORE EXAMPLES
 
 Larger examples, demos and samples can be found in
-@prefix@/doc/systemtap*/examples, each example comes with either a .txt
+@prefix@/share/doc/packages/systemtap/examples, each example comes with either a .txt
 or .meta file explaining what the example, sample or demo does and how
 it is ordinarily run.
 
 .SH SEE ALSO
-.BR @prefix@/doc/systemtap*/examples
+.BR @prefix@/share/doc/packages/systemtap/examples
 .IR stap (1)
 .IR stapprobes (5)
 .IR stapfuncs (5)
--- Makefile.am-dist	2008-08-16 16:27:07.000000000 +0200
+++ Makefile.am	2008-08-18 18:02:30.000000000 +0200
@@ -191,7 +191,7 @@
 		| while read f; do if test -x $$f; then \
 			i_cmd="$(INSTALL_PROGRAM)"; else \
 			i_cmd="$(INSTALL_DATA)"; fi; \
-			$$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
+			$$i_cmd -D $$f $(DESTDIR)$(datadir)/doc/packages/systemtap/examples/$$f; done)
 
 TEST_COV_DIR = coverage
 
--- doc/Makefile.am-dist	2008-08-16 16:27:07.000000000 +0200
+++ doc/Makefile.am	2008-08-18 18:01:39.000000000 +0200
@@ -2,7 +2,7 @@
 ## process this file with automake to produce Makefile.in
 
 PDF_FILES = tutorial.pdf langref.pdf
-DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap
 
 if BUILD_DOCS
 all-local: $(PDF_FILES)