diff --git a/PKGBUILD b/PKGBUILD
index 540197f..1a8d16b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20130429
+pkgver=20130508
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
@@ -8,7 +8,7 @@ license=('GPL-2.0+' 'GPL-2.0')
 groups=('base-devel')
 depends=('perl')
 source=(obs-build-${pkgver}.tar.gz)
-md5sums=('a789f80b0352f0ab20e0822328665c4d')
+md5sums=('61d38fe23efcd677e24a6f6919409d5b')
 
 package() {
   msg "Installing build ..."
diff --git a/build-initvm.changes b/build-initvm.changes
deleted file mode 100644
index 0d0817a..0000000
--- a/build-initvm.changes
+++ /dev/null
@@ -1,12 +0,0 @@
--------------------------------------------------------------------
-Tue Oct  4 12:43:27 UTC 2011 - adrian@suse.de
-
-- use new qemu-*-binfmt handler to run commands with correct $0
-- fix build for Factory
-
--------------------------------------------------------------------
-Mon Mar 21 07:02:52 UTC 2011 - adrian@suse.de
-
-- initial package for new cross build support for OBS. Done by 
-  James Perkins from LinuxFoundation
-
diff --git a/build-initvm.spec b/build-initvm.spec
deleted file mode 100644
index 55cd417..0000000
--- a/build-initvm.spec
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# spec file for package build-initvm
-#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-Name:           build-initvm
-Summary:        A Script to Build SUSE Linux RPMs
-License:        GPL-2.0+
-Group:          Development/Tools/Building
-Version:        20130429
-Release:        0
-Source:         obs-build-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-AutoReqProv:    off
-Requires:       build
-BuildRequires:  gcc
-BuildRequires:  glibc-devel
-%if 0%{?suse_version} > 1200
-BuildRequires:  glibc-devel-static
-%endif
-
-%description
-This package provides a script for building RPMs for SUSE Linux in a
-chroot or a secure virtualized environment.
-
-
-%prep
-%setup -q -n obs-build-%version
-
-%build
-make CFLAGS="$RPM_BUILD_FLAGS" initvm-all
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT initvm-install
-
-%files
-%defattr(-,root,root)
-/usr/lib/build/initvm
-
-%changelog
diff --git a/build.changes b/build.changes
index 3e6e4f4..83e3554 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May  8 11:12:37 UTC 2013 - adrian@suse.de
+
+- support multi architecture initvm binaries
+  => vminit gets build as subpackage now again
+- De-hardcode hugetlbfs from ppc
+- Do not emulate VGA
+- support new nameing scheme of install images of kiwi builds
+
 -------------------------------------------------------------------
 Mon Apr 29 07:40:19 UTC 2013 - adrian@suse.de
 
diff --git a/build.dsc b/build.dsc
index 6746327..dbccbbe 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20130429
+Version: 20130508
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 749cdca..288fd4e 100644
--- a/build.spec
+++ b/build.spec
@@ -20,7 +20,7 @@ Name:           build
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0+ and GPL-2.0
 Group:          Development/Tools/Building
-Version:        20130429
+Version:        20130508
 Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Source:         obs-build-%{version}.tar.gz
@@ -85,12 +85,36 @@ for generating delta rpm packages.
 
 %endif
 
+%package initvm-%{_host_cpu}
+Summary:        Virtualization initializer for emulated cross architecture builds
+Group:          Development/Tools/Building
+Requires:       build
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+Provides:       build-initvm
+Obsoletes:      build-initvm
+%if 0%{?suse_version} > 1200
+BuildRequires:  glibc-devel-static
+%endif
+
+%description initvm-%{_host_cpu}
+This package provides a script for building RPMs for SUSE Linux in a
+chroot or a secure virtualized
+
 %prep
 %setup -q -n obs-build-%version
 
 %build
+make CFLAGS="$RPM_BUILD_FLAGS" initvm-all
 
 %install
+# initvm
+strip initvm.%{_host_cpu}
+make DESTDIR=$RPM_BUILD_ROOT initvm-install
+export NO_BRP_STRIP_DEBUG="true"
+chmod 0644 $RPM_BUILD_ROOT/usr/lib/build/initvm.*
+
+# main
 make DESTDIR=$RPM_BUILD_ROOT install
 cd $RPM_BUILD_ROOT/usr/lib/build/configs/
 %if 0%{?suse_version}
@@ -112,6 +136,7 @@ test -e default.conf
 /usr/lib/build
 %config(noreplace) /usr/lib/build/emulator/emulator.sh
 %{_mandir}/man1/build.1*
+%exclude /usr/lib/build/initvm.*
 
 %if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
 %exclude /usr/lib/build/mkbaselibs
@@ -130,4 +155,8 @@ test -e default.conf
 /usr/lib/build/mkdrpms
 %endif
 
+%files initvm-%{_host_cpu}
+%defattr(-,root,root)
+/usr/lib/build/initvm.*
+
 %changelog
diff --git a/obs-build-20130429.tar.gz b/obs-build-20130429.tar.gz
deleted file mode 100644
index d30ab26..0000000
--- a/obs-build-20130429.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d9c12fecf7a278a3af327d0495b67fe409ea71385c9288f7fe823e034589beb
-size 152695
diff --git a/obs-build-20130508.tar.gz b/obs-build-20130508.tar.gz
new file mode 100644
index 0000000..46f9155
--- /dev/null
+++ b/obs-build-20130508.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:347b5d1e3b3079db827c760e9cd6fb040bf33314584317fcba9249561c14de33
+size 152330