diff --git a/Makefile.am b/Makefile.am
index c2b3a0e5..71d082ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,15 +54,15 @@ EXTRA_DIST=$(BASENAME).$(LANG1).dix \
 ## Installation stuff
 ###############################################################################
 #
-#   apertium_nob_libdir: This is where the compiled binaries go
+#   apertium_nob_dir: This is where the compiled binaries go
 #   apertium_nob_srcdir: This is where the source files go
 
-apertium_nobdir=$(prefix)/lib/apertium/$(BASENAME)/
+apertium_nobdir=$(prefix)/share/apertium/$(BASENAME)/
 apertium_nob_srcdir=$(prefix)/share/apertium/$(BASENAME)/
 
 apertium_nob_DATA=$(TARGETS_COMMON) $(LANG1).prob
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/share/pkgconfig
 pkgconfig_DATA = $(BASENAME).pc
 
 # Modes are not installed since they're all just "debug modes". All
diff --git a/autogen.sh b/autogen.sh
index ff15207a..f9f430ae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,7 +25,7 @@ PATH="${PATH}:/usr/local/bin"
 export PATH
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PREFIX}/lib"
 export LD_LIBRARY_PATH
-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/lib/pkgconfig"
+PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${PREFIX}/share/pkgconfig:${PREFIX}/lib/pkgconfig"
 export PKG_CONFIG_PATH
 ACLOCAL_PATH="${ACLOCAL_PATH}:${PREFIX}/share/aclocal"
 export ACLOCAL_PATH