diff --git a/config.d/qfcc.m4 b/config.d/qfcc.m4
index adf9e4d69..7a07ec2e0 100644
--- a/config.d/qfcc.m4
+++ b/config.d/qfcc.m4
@@ -32,9 +32,9 @@ AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/',
 	[Define this to your operating system path separator character])
 AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME",
 	[Define this to the command line for the C preprocessor])
-AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${prefix}/include/QF/ruamoko",
-	[Define this to where qfcc should look for header files])
-eval expanded_libdir="${libdir}/ruamoko"
+eval expanded_libdir="${libdir}"
 eval expanded_libdir="${expanded_libdir}"
-AC_DEFINE_UNQUOTED(QFCC_LIB_PATH, "${expanded_libdir}",
+AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${expanded_libdir}/qfcc/include",
+	[Define this to where qfcc should look for header files])
+AC_DEFINE_UNQUOTED(QFCC_LIB_PATH, "${expanded_libdir}/qfcc/lib",
 	[Define this to where qfcc should look for lib files])
diff --git a/pkg-config/qfcc.pc.in b/pkg-config/qfcc.pc.in
index 2afb36f97..85290c34f 100644
--- a/pkg-config/qfcc.pc.in
+++ b/pkg-config/qfcc.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@/ruamoko
-includedir=@prefix@/include/QF/ruamoko
+libdir=@libdir@/qfcc/lib
+includedir=@libdir@/qfcc/include
 
 Name: qfcc
 Description: Ruamoko/QuakeC compiler/linker
diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am
index a88c95520..baa9cddea 100644
--- a/ruamoko/gui/Makefile.am
+++ b/ruamoko/gui/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
 
-pkglibdir=$(libdir)/ruamoko
+pkglibdir=$(libdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -g -Werror -Wall -Wno-integer-divide
diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am
index 73bd62c17..be5ba9bd0 100644
--- a/ruamoko/include/Makefile.am
+++ b/ruamoko/include/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS=	foreign
-pkgincludedir=	$(includedir)/QF/ruamoko
+pkgincludedir=	$(libdir)/qfcc/include
 nobase_pkginclude_HEADERS= \
 	crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
 	physics.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h server.h \
diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am
index 6f13c03f8..174906646 100644
--- a/ruamoko/lib/Makefile.am
+++ b/ruamoko/lib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
 
-pkglibdir=$(libdir)/ruamoko
+pkglibdir=$(libdir)/qfcc/lib
 
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QCFLAGS=-qq -g -Wall -Wno-integer-divide -Werror
diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am
index 867a6c48e..c0648d836 100644
--- a/ruamoko/scheme/Makefile.am
+++ b/ruamoko/scheme/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS=	foreign
 
-pkglibdir=$(libdir)/ruamoko
+pkglibdir=$(libdir)/qfcc/lib
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(QFCC_DEP)