diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 683b2703..aa87db05 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -1036,21 +1036,18 @@ trap goodbye SIGINT SIGKILL
 
 # -- default values
 TOPDIR=.
-MOD_SCRIPT_DIR=`dirname $0`
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
-#RELEASES=`read_map $TOPDIR/RELEASES`
-myname=`basename $0`
+myname="${0##*/}"
 cmdline="$0 $@"
 tmp_mkdef_sh=""
 PROJECT_DESCR_FILE=$TOPDIR/make/project.conf
 DIST_SRC_DIR=dist/src
 DIST_INST_DIR=dist/src
 DIST_PCKG_DIR=dist/pckg
-PROJECT=`abspath $TOPDIR | xargs basename`
 RPM_PROJECT="$PROJECT"
 RPM_REQUIRES_RUN=""
 RPM_REQUIRES_DEVEL=""
-RPM_ARCH=`arch`
+RPM_ARCH=$HOSTTYPE
 PKG_FORMAT=rpm
 SSH=ssh
 SCM=cvs
@@ -1130,6 +1127,9 @@ while [ ${1:0:1} = - ]; do
 	shift
 done
 
+[ "$MOD_SCRIPT_DIR" ]  || MOD_SCRIPT_DIR=`dirname $0`
+[ "$PROJECT" ] || PROJECT=`abspath $TOPDIR | xargs basename`
+
 cmd=$1
 shift