diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index bc50e85d..9c53dbce 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -35,7 +35,7 @@ RPM_VERSION              ?= $(DIST_VERSION)
 LAST_RPM_VERSION_FILE     = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
 LAST_RPM_VERSION         ?= $(shell sh $(MOD_SCRIPT_DIR)/platform-map-file.sh \
 	-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//')
-RPMBUILD                 ?= rpmbuild
+RPMBUILD                 ?= pkgbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
 HASH                      = $(shell $(cvs_files) | \
 	grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
@@ -74,8 +74,8 @@ 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))
+  RPMS_DIR                = $(firstword $(wildcard $(HOME)/pkgbuild/RPMS/$(RPM_ARCH) /usr/src/packages/RPMS/$(RPM_ARCH)))
+  SRPMS_DIR               = $(firstword $(wildcard $(HOME)/pkgbuild/SRPMS /usr/src/packages/SRPMS))
 endif
 
 DIST_DIRS                 = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
@@ -101,24 +101,24 @@ BUILD_PACKAGE_SH          = /bin/bash $(MOD_SCRIPT_DIR)/build-package.sh \
 
 all:
 install:
-clean: rpm-clean
-distclean: rpm-clean
+clean: pkg-clean
+distclean: pkg-clean
 
 tgz: $(DIST_PCKG_DIR)/$(PCKG_TAR)
 ftag: ftag.dist
 
-rpm-upload-stable: rpm-upload-STABLE.dist
-rpm-upload-rc: rpm-upload-RC.dist
+pkg-upload-stable: pkg-upload-STABLE.dist
+pkg-upload-rc: pkg-upload-RC.dist
 
-rpm-clean: clean.rpm
-#rpm-clean: clean.mkspec
-rpm-uninstall: config rpmuninstall.dist
-rpm-build: rpm-build.dist
-rpm-install: config rpm-build rpminstall.dist
-rpm-reinstall: rpm-uninstall rpm-clean rpm-install
-rpm-rebuild: rpm-clean rpm-build
-rpm-update: rpmupdate.dist
-rpm-upload-local: rpm-upload-local.dist
+pkg-clean: clean.rpm
+#pkg-clean: clean.mkspec
+pkg-uninstall: config pkguninstall.dist
+pkg-build: pkg-build.dist
+pkg-install: config pkg-build pkginstall.dist
+pkg-reinstall: pkg-uninstall pkg-clean pkg-install
+pkg-rebuild: pkg-clean pkg-build
+pkg-update: pkgupdate.dist
+pkg-upload-local: pkg-upload-local.dist
 
 clean.rpm:
 	rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
@@ -138,11 +138,11 @@ clean.rpm:
 #
 #endif
 
-rpm-build.dist:
+pkg-build.dist:
 	$(BUILD_PACKAGE_SH) build
 	touch $@
 
-rpm-update-local-repo:
+pkg-update-local-repo:
 	for a in src i386 i586 i686 x86_64; do \
 		if ls dist/*/*.$$a.rpm >/dev/null 2>&1; then \
 			sudo install -m 644 dist/pckg/*.$$a.rpm $(LOCAL_REPO)/rpm/$$a/ ;\
@@ -171,14 +171,14 @@ src-dir.dist:
 #	echo $(CURRENT_$*) > $@
 #
 
-rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
+pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
 	touch $@
 
-rpm-upload-local.dist: rpmbuild.dist
+pkg-upload-local.dist: pkgbuild.dist
 	$(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
 	touch $@
 
-rpminstall.dist: rpm-build.dist
+pkginstall.dist: pkg-build.dist
 	@set -e; for p in $(BINARY_RPM); do \
 		if ! $(RPM) -q `basename $$p | $(SED) "s/[._]$(RPM_ARCH)\.$(RPM_SUFFIX)//; s/_\([0-9.-]\+\)$$/-\1/"` > /dev/null 2>&1 ; then \
 			echo + installing $$p ;\
@@ -187,21 +187,21 @@ rpminstall.dist: rpm-build.dist
 	done
 	touch $@
 
-#rpmupdate.dist: $(DIST_PCKG_RPM)
+#pkgupdate.dist: $(DIST_PCKG_RPM)
 #	@set -e; for p in $^; do \
 #		echo + updating $$p ;\
 #		sudo /bin/rpm -U --replacepkgs --replacefiles $$p; \
 #	done
 #	touch $@
 
-rpmuninstall.dist:
+pkguninstall.dist:
 	@set -e; for s in devel run; do \
 		if $(RPM) -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \
 			echo + removing $(RPM_PROJECT)-$$s ;\
 			sudo $(RPM) -e $(RPM_PROJECT)-$$s --nodeps --allmatches; \
 		fi; \
 	done
-	rm -f rpminstall.dist
+	rm -f pkginstall.dist
 
 upload-%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
 	cvs commit $<
@@ -286,19 +286,19 @@ define increase_build_number
 endef
 
 define check_reinstall_old
-	(true $(addprefix && test -f ,$(DIST_PCKG_RPM)) && make rpm-uninstall && make rpm-install)
+	(true $(addprefix && test -f ,$(DIST_PCKG_RPM)) && make pkg-uninstall && make pkg-install)
 endef
 
 md5: 
 	echo $(HASH) > HASH
 
-rpm-next-build:
+pkg-next-build:
 	@$(increase_build_number)
 
 try-reinstall:
 	$(check_reinstall_old)
 
-rpm-update-release:
+pkg-update-release:
 	@if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
 		echo + source was modified ;\
 		$(increase_build_number) ;\
@@ -307,26 +307,26 @@ rpm-update-release:
 		$(increase_build_number) ;\
 	fi
 
-rpm-check-release:
+pkg-check-release:
 	@if [ "`$(CAT) HASH`" != "$(HASH)" ]; then \
 		echo + source was modified ;\
 	else \
 		echo + source is unmodified ;\
 	fi
 
-rpm-release: rpm-release-reinstall
+pkg-release: pkg-release-reinstall
 
 # doesn't work
-# rpm-release-update: rpm-release rpm-update
+# pkg-release-update: pkg-release pkg-update
 
-rpm-release-reinstall: update
+pkg-release-reinstall: update
 	$(BUILD_PACKAGE_SH) release
 
 ifneq ($(TARGET_HOST),)
-rpm-remote-install:
+pkg-remote-install:
 	scp $(addprefix dist/pckg/,$(PCKG_RPM_RUN_I386) $(PCKG_RPM_DEVEL_I386)) root@$(TARGET_HOST):/tmp/
 	ssh -l root $(TARGET_HOST) rpm -U --force $(addprefix /tmp/,$(PCKG_RPM_RUN_I386) $(PCKG_RPM_DEVEL_I386))
-rpm-remote-install-run: rpm-install-remote.done
+pkg-remote-install-run: pkg-install-remote.done
 	scp $(addprefix dist/pckg/,$(PCKG_RPM_RUN_I386)) root@$(TARGET_HOST):/tmp/
 	ssh -l root $(TARGET_HOST) rpm -U --force $(addprefix /tmp/,$(PCKG_RPM_RUN_I386))
 endif