--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,16 @@

 SUBDIRS = src

-man_MANS = doc/$(PACKAGE).6
+man_MANS = doc/afternoonstalker.6

-docdir = $(datarootdir)/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = \
 	AUTHORS \
-	COPYING \
 	NEWS \
 	README \
 	THANKS

 EXTRA_DIST = \
+	COPYING \
 	bootstrap \
 	autogen.sh \
 	$(PACKAGE).spec \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@
 pixmapdir = $(datarootdir)/pixmaps
 pixmap_DATA = images/$(PACKAGE).png

-pkgpixmapdir = $(datarootdir)/pixmaps/$(PACKAGE)
+pkgpixmapdir = $(pkgdatadir)/pixmaps/$(PACKAGE)
 pkgpixmap_DATA = \
 	images/cobweb_tile.xpm \
 	images/floor_tile.xpm \
@@ -122,7 +122,7 @@
 	images/digit8.xpm \
 	images/digit9.xpm

-pkgsounddir = $(datarootdir)/sounds/$(PACKAGE)
+pkgsounddir = $(pkgdatadir)/sounds/$(PACKAGE)
 pkgsound_DATA = \
 	sounds/gun-pickup.wav \
 	sounds/bat-killed.wav \