diff --git a/Makefile.am b/Makefile.am
index 5e2e05248..1ea8ffeda 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,3 +4,7 @@ SUBDIRS = @BULLETTREE@ src doc data
 
 EXTRA_DIST = README README.cygwin README.macosx README.windows ChangeLog COPYING missing
 
+pkgdatadir=$(datadir)/doc/@PACKAGE@
+pkgdata_DATA=AUTHORS ChangeLog COPYING README
+# NEWS only contains "see changelog"
+# CHANGES only contains "see NEW"
\ No newline at end of file
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f5eed7c4..2908f3e0c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,6 +2,6 @@
 
 SUBDIRS      = players_manual
 
-pkgdatadir   = $(datadir)/games/@PACKAGE@/doc
+pkgdatadir   = $(datadir)/doc/@PACKAGE@/
 
 EXTRA_DIST   = conventions.txt implementation.txt robots.txt 
diff --git a/doc/players_manual/Makefile.am b/doc/players_manual/Makefile.am
index 3e92eb0fd..509483fdd 100644
--- a/doc/players_manual/Makefile.am
+++ b/doc/players_manual/Makefile.am
@@ -1,6 +1,6 @@
 # doc/players_manual
 
-pkgdatadir   = $(datadir)/games/@PACKAGE@/doc/players_manual
+pkgdatadir   = $(datadir)/doc/@PACKAGE@/players_manual
 
 pkgdata_DATA = manual.html  $(shell find $(srcdir) -name "*.png") \
                             $(shell find $(srcdir) -name "*.jpg")
diff --git a/src/Makefile.am b/src/Makefile.am
index 420fb37c1..d6f90acc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # src/
-
+bindir=@prefix@/games
 bin_PROGRAMS = supertuxkart
 
 # This is a VERY ugly work-around for a compiler bug: if static_ssg s compiled with -O2