diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am
index 839f34f8b..260c852cd 100644
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
-includedir = $(prefix)/include/QF
-nobase_include_HEADERS = \
+pkgincludedir = $(includedir)/QF
+nobase_pkginclude_HEADERS = \
 	bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
 	console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h hl.h \
 	idparse.h image.h in_event.h info.h input.h joystick.h keys.h link.h \
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index c461c4054..5fdeb61cc 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
 
-libdir=$(prefix)/lib/ruamoko
+pkglibdir=$(libdir)/ruamoko
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -g -Werror
@@ -17,7 +17,7 @@ else
 libs=
 endif
 
-lib_LIBRARIES= $(libs)
+pkglib_LIBRARIES= $(libs)
 EXTRA_LIBRARIES= $(gui_libs)
 
 %.qfo: %.r
diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
index a7e63d9ce..3138a98a5 100644
--- a/ruamoko/include/Makefile.am
+++ b/ruamoko/include/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
-includedir=	$(prefix)/include/QF/ruamoko
-nobase_include_HEADERS= \
+pkgincludedir=	$(includedir)/QF/ruamoko
+nobase_pkginclude_HEADERS= \
 	crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
 	physics.h qfile.h qw_message.h qw_physics.h qw_sys.h server.h sound.h \
 	string.h system.h \
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index b21e83986..ebf3cdc40 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
 
-libdir=$(prefix)/lib/ruamoko
+pkglibdir=$(libdir)/ruamoko
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -g -Werror
@@ -17,7 +17,7 @@ else
 libs=
 endif
 
-lib_LIBRARIES= $(libs)
+pkglib_LIBRARIES= $(libs)
 EXTRA_LIBRARIES= $(ruamoko_libs)
 
 %.qfo: %.r