--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,16 @@
 
 SUBDIRS = src
 
-man_MANS = doc/$(PACKAGE).6
+man_MANS = doc/afternoonstalker.6
 
-docdir = $(datadir)/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
@@ -114,13 +114,13 @@
 	images/digit8.xpm \
 	images/digit9.xpm
 
-desktopentrydir = $(datadir)/applications
+desktopentrydir = $(datarootdir)/applications
 desktopentry_DATA = $(PACKAGE).desktop
 
-pixmapdir = $(datadir)/pixmaps
+pixmapdir = $(datarootdir)/pixmaps
 pixmap_DATA = images/$(PACKAGE).png
 
-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
+pkgsounddir = $(pkgdatadir)/sounds
 pkgsound_DATA = \
 	sounds/gun-pickup.wav \
 	sounds/bat-killed.wav \