diff --git a/LAST_RPM_VERSION b/RELEASES
similarity index 100%
rename from LAST_RPM_VERSION
rename to RELEASES
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index 371bf0b3..2069bbbc 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -102,7 +102,7 @@ PGIT_SH               = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh
 PURGE_SH              = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
 PKG_MANAGER_SH       ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
 CREATE_PROJECT_SH    ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
-LIST_VCS_FILES_SH     = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh ls-files /opt/jw-build/bin/scm.sh ls-files) list-vcs-files-not-found)
+LIST_VCS_FILES_SH     = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
 JW_PKG                = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
 GIT_SRV_ADMIN_SH      = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh 
 CVS_ADMIN_SH          = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/cvs-admin.sh 
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 998fbc47..6f0837ec 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -16,9 +16,9 @@ FTP_DIR_MODE             ?= 755
 FTP_HOST                 ?= ftp.jannet.de
 FTP_HOST_LOGIN           ?= root
 RPM_VERSION              ?= $(DIST_VERSION)
-LAST_RPM_VERSION_FILE     = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
-LAST_RPM_VERSION         ?= $(shell $(PKG_SH_EXE) version \
-	-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//')
+RELEASES_FILE     = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
+RELEASES         ?= $(shell $(PKG_SH_EXE) version \
+	-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
 RPMBUILD                 ?= pkgbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
 HASH                      = $(shell $(cvs_files) -z | \
@@ -269,8 +269,8 @@ define increase_build_number
 	if [ "$(CHECK_CVS_SYNC_BEFORE_RPM_RELEASE)" = true ]; then \
 		$(check_scm_sync) ;\
 	fi ;\
-	if [ "$(LAST_RPM_VERSION)" != "$(RPM_VERSION)" ]; then \
-		echo "+ no need to increase build number of $(RPM_VERSION), last rpm has $(LAST_RPM_VERSION)" ;\
+	if [ "$(RELEASES)" != "$(RPM_VERSION)" ]; then \
+		echo "+ no need to increase build number of $(RPM_VERSION), last rpm has $(RELEASES)" ;\
 		exit 0 ;\
 	fi ;\
 	echo -n "+ increasing build number to " ;\
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 01219310..53e55771 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -162,7 +162,7 @@ increase_build_no()
 check_next_version()
 {
 	local v=`read_map $TOPDIR/VERSION | sed 's/-dev//'`
-	local n=`read_map -n $TOPDIR/LAST_RPM_VERSION | sed 's/-dev//'`
+	local n=`read_map -n $TOPDIR/RELEASES | sed 's/-dev//'`
 	if [ "$n" != "$v" ]; then
 		echo "+ $RPM_PROJECT version is already at $v, no need to increase for release" >&2
 		echo $v
@@ -258,8 +258,8 @@ check_release_is_current()
 	done
 	shift
 
-	if ! read_map -n $TOPDIR/LAST_RPM_VERSION | grep -Fq $next; then
-		echo "next version $next is not in LAST_RPM_VERSION, needs release" >&2
+	if ! read_map -n $TOPDIR/RELEASES | grep -Fq $next; then
+		echo "next version $next is not in RELEASES, needs release" >&2
 		return 1
 	fi
 
@@ -610,13 +610,13 @@ upload_pkg()
 		;;
 	esac
 
-	write_map $TOPDIR/LAST_RPM_VERSION $v
-	$SCM add $TOPDIR/LAST_RPM_VERSION || true
+	write_map $TOPDIR/RELEASES $v
+	$SCM add $TOPDIR/RELEASES || true
 	write_map $TOPDIR/HASH $h
 	$SCM add $TOPDIR/HASH || true
 	echo "+ scheduling rebuild"
 	$SSH -l root $server /opt/packager-server/bin/packager-server schedule-rebuild
-	scm_commit -m "Release $v@`platform`" $TOPDIR/LAST_RPM_VERSION $TOPDIR/HASH
+	scm_commit -m "Release $v@`platform`" $TOPDIR/RELEASES $TOPDIR/HASH
 	if [ "$SCM" = git ]; then
 		git push || true
 	fi
@@ -1008,7 +1008,7 @@ trap goodbye SIGINT SIGKILL
 TOPDIR=.
 MOD_SCRIPT_DIR=`dirname $0`
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
-#LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION`
+#RELEASES=`read_map $TOPDIR/RELEASES`
 myname=`basename $0`
 cmdline="$0 $@"
 tmp_mkdef_sh=""