diff --git a/package/base/bdb/pkgmapper.in b/package/base/bdb/pkgmapper.in
new file mode 100644
index 000000000..717dbd793
--- /dev/null
+++ b/package/base/bdb/pkgmapper.in
@@ -0,0 +1,6 @@
+
+case "$pkg" in
+	bdb33|bdb4[012])
+		pkg=bdb ;;
+esac
+
diff --git a/package/base/gcc/pkgmapper.in b/package/base/gcc/pkgmapper.in
new file mode 100644
index 000000000..2fe0c4ed3
--- /dev/null
+++ b/package/base/gcc/pkgmapper.in
@@ -0,0 +1,5 @@
+
+if [ -z "${pkg##gcc[23]*}" ]; then
+	pkg=gcc
+fi
+
diff --git a/package/base/glibc/pkgmapper.in b/package/base/glibc/pkgmapper.in
new file mode 100644
index 000000000..de14cf97c
--- /dev/null
+++ b/package/base/glibc/pkgmapper.in
@@ -0,0 +1,5 @@
+
+if [ -z "${pkg##glibc2*}" ]; then
+	pkg=glibc
+fi
+
diff --git a/package/base/linux/pkgmapper.in b/package/base/linux/pkgmapper.in
new file mode 100644
index 000000000..5dfdadfa6
--- /dev/null
+++ b/package/base/linux/pkgmapper.in
@@ -0,0 +1,5 @@
+
+if [ -z "${pkg##linux2*}" ]; then
+	pkg=linux
+fi
+
diff --git a/package/rene/subversion/pkgmapper.in b/package/rene/subversion/pkgmapper.in
new file mode 100644
index 000000000..cc179c449
--- /dev/null
+++ b/package/rene/subversion/pkgmapper.in
@@ -0,0 +1,5 @@
+
+if [ "$pkg" = subversion-static ]; then
+	pkg=subversion
+fi
+
diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 604381ddf..0c0b950cc 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -134,8 +134,13 @@ if [ $# -gt 1 ] ; then
     done
     exit 0
 fi
-pkg="${1%=*}" ; xpkg="${1#*=}"
-builddir="$base/src.$pkg.$id"
+
+# parameter 1 has $pkg=$xpkg
+pkg="${1%=*}"; xpkg="${1#*=}"
+builddir="$base/src.$xpkg.$id"
+
+# get real pkg name for mapped packages
+. build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper
 
 if [ "$chroot" = 1 ] ; then
 
diff --git a/scripts/Build-Tools b/scripts/Build-Tools
index b5cc43fdd..e6a5cb43e 100755
--- a/scripts/Build-Tools
+++ b/scripts/Build-Tools
@@ -279,7 +279,6 @@ EOT
 
 	# Create pkg_*_{pre,post}.conf files
 	#
-
 	rm -f build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkg_*_{pre,post}.conf
 	echo_status "Creating $toolsdir/lib/pkg_*_{pre,post}.conf"
 	for x in `grep "^X" config/$config/packages | cut -d ' ' -f 4,5 | tr ' ' '/'`; do
@@ -290,6 +289,18 @@ EOT
 	   done
 	done
 
+	# Create pkgmapper script
+	#
+	bash scripts/xfind.sh \
+	     architecture/$arch/. package/. target/$target/. misc/ -type f \
+	     -name 'pkgmapper.in' \
+	     -printf '%f\t%p\n' | sort | awk '{ $1="."; print; }' \
+			> build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper.$$
+	mv build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper.$$ \
+	   build/$ROCKCFG_ID/ROCK/$toolsdir/lib/pkgmapper
+
+	# Create cmd_wrapper config
+	#
 	echo -e "${wrappervars// /\n}" | grep . | sort -u |
 	while read x ; do
 		echo "export ${x}_WRAPPER_DEBUG=0	${x}_WRAPPER_BYPASS=0"