diff --git a/make/defs.mk b/make/defs.mk
index f2fe07fb..32e01a0a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -168,7 +168,8 @@ else ifeq ($(ARCH),aarch64)
   PROJECT_LDFLAGS       +=
 endif
 
-JANWARE_USER          ?= $(shell id -un)
+BUILD_USER            := $(shell id -un)
+JANWARE_USER          ?= $(BUILD_USER)
 JANWARE_CLIENT        ?= jw
 JANWARE_WIKI          ?= $(JANWARE_CLIENT)
 JANWARE_URL_DOC_MODULE   ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell $(PWD)))
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 06edf0a1..9fefadc3 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -59,8 +59,13 @@ ifeq ($(PKG_FORMAT),debian)
   RPMS_DIR                = $(TOPDIR)/dist/src
   SRPMS_DIR               = $(TOPDIR)/dist/src
 else
-  RPMS_DIR                = $(firstword $(wildcard $(HOME)/rpmbuild/RPMS/$(RPM_ARCH) /usr/src/packages/RPMS/$(RPM_ARCH)))
-  SRPMS_DIR               = $(firstword $(wildcard $(HOME)/rpmbuild/SRPMS /usr/src/packages/SRPMS))
+  ifeq ($(BUILD_USER),root)
+    RPMS_BUILD_DIR        = /usr/src/packages
+  else
+    RPMS_BUILD_DIR        = $(HOME)/rpmbuild
+  endif
+  RPMS_DIR                = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH)
+  SRPMS_DIR               = $(RPMS_BUILD_DIR)/SRPMS
 endif
 
 DIST_DIRS                 = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 3cdb6be3..84dab377 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -1129,8 +1129,14 @@ shift
 export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
 export PKG_SH=`readlink -f $0`
 
-SRPMS_DIR=`find_path $HOME/rpmbuild/SRPMS /usr/src/packages/SRPMS`
-RPMS_DIR=`find_path $HOME/rpmbuild/RPMS/$RPM_ARCH /usr/src/packages/RPMS/$RPM_ARCH`
+
+if [ `whoami` = root ]; then
+	RPMS_BUILD_DIR=/usr/src/packages
+else
+	RPMS_BUILD_DIR=$HOME/rpmbuild
+fi
+SRPMS_DIR=$RPMS_BUILD_DIR/SRPMS
+RPMS_DIR=$RPMS_BUILD_DIR/RPMS/$RPM_ARCH
 
 # shift