--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,20 @@
 
 SUBDIRS = src
 
-man_MANS = doc/$(PACKAGE).6
+man_MANS = doc/batrachians.6
 
 RPMBUILD = rpmbuild
 rpm: dist
 	$(RPMBUILD) -ta $(distdir).tar.gz
 
-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
@@ -20,7 +20,7 @@
 	-DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \
 	-DPKGSOUNDDIR=\"$(pkgsounddir)\"
 
-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
+pkgsounddir = $(pkgdatadir)/sounds
 pkgsound_DATA = \
 	sounds/game-starts.wav \
 	sounds/game-ends.wav \
@@ -29,10 +29,10 @@
 	sounds/frog-jumps.wav \
 	sounds/tongue-out.wav
 
-desktopentrydir = $(datadir)/applications
+desktopentrydir = $(datarootdir)/applications
 desktopentry_DATA = $(PACKAGE).desktop
 
-pixmapdir = $(datadir)/pixmaps
+pixmapdir = $(datarootdir)/pixmaps
 pixmap_DATA = images/$(PACKAGE).png