diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 7bc9751e..32fe7765 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -30,7 +30,7 @@ CTRLDIR          ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
 DAEMON_RUN_DIR   ?= $(VAR_PREFIX)/corefiles
 PROFILE_DIR      ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d
 INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
-INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)/usr/lib/pkgconfig
+INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)$(SYSTEM_LIBDIR)/pkgconfig
 PIDDIR           ?= $(VAR_PREFIX)/run
 DOWNLOADDIRS     ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
 WORKING_DIR      ?= $(VAR_PREFIX)/coredumps
diff --git a/make/defs.mk b/make/defs.mk
index c08ef9d1..e48cb34f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -122,12 +122,15 @@ TARGET                ?= Linux
 ifndef ARCH
   ifeq ($(shell uname -m),armv7l)
     ARCH               = armv7hl
+    SYSTEM_LIBDIR      = /usr/lib
   else
     ifeq ($(shell uname -m),x86_64)
       ARCH             = x86_64
+      SYSTEM_LIBDIR    = /usr/lib64
     else
       ARCH_32          = i586
       ARCH             = $(ARCH_32)
+      SYSTEM_LIBDIR    = /usr/lib
     endif
   endif
 endif
diff --git a/make/make.mk b/make/make.mk
index 83c0247c..495befa4 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -50,8 +50,8 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
 		-v $(DIST_VERSION) \
 		-p $(PROJECT_DIRPATH) \
 		-V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
-		-r $(RPM_REQUIRES_RUN) \
-		-R $(RPM_REQUIRES_DEVEL) \
+		-r "$(RPM_REQUIRES_RUN)" \
+		-R "$(RPM_REQUIRES_DEVEL)" \
 		$(CREATE_PKG_CONFIG_OPTS) \
 		> $@.tmp
 	mv $@.tmp $@