diff --git a/PKGBUILD b/PKGBUILD
index df9e7e96..0ffebe88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20150317
+pkgver=20150615
 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=('deaeff7a854cb1668560813f55980587')
+md5sums=('fa2ad796c1407587342ac2a6339a1659')
 
 package() {
   msg "Installing build ..."
diff --git a/baselibs.conf b/baselibs.conf
deleted file mode 100644
index 951e38eb..00000000
--- a/baselibs.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-arch i386 targets x86_64:i386
-arch i586 targets x86_64:i586
-build-initvm
-  targetname <name>-<targettype>
-  targettype i386 provides "build-initvm"
-  targettype i586 provides "build-initvm"
-  targettype i386 +/usr
-  targettype i586 +/usr
diff --git a/build.changes b/build.changes
index 2397bbc6..cc29099e 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Jun 17 15:01:43 UTC 2015 - adrian@suse.de
+
+- fixing test suite call
+
+-------------------------------------------------------------------
+Mon Jun 15 11:41:12 UTC 2015 - adrian@suse.de
+
+- support build time source services
+- docker VM support
+- Simple image creation support
+- vc: create changelog file only in case of a change
+- get hostarch based on preinstalled kernel image
+- architecture CanDo updates
+- avoid endless loops during in binfmt misc registration
+- debian debootstrap fixes
+- added support of debbuild build engine
+- optional support of network inside of KVM
+- allow lintian to break the build
+
 -------------------------------------------------------------------
 Tue Mar 17 07:20:36 UTC 2015 - adrian@suse.de
 
diff --git a/build.dsc b/build.dsc
index b8edceb3..972e8b01 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20150317
+Version: 20150615
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 917e0eb9..0cc0a88a 100644
--- a/build.spec
+++ b/build.spec
@@ -22,11 +22,9 @@ Name:           build
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0+ and GPL-2.0
 Group:          Development/Tools/Building
-Version:        20150317
+Version:        20150615
 Release:        0
 Source:         obs-build-%{version}.tar.gz
-#!BuildIgnore:  build-mkbaselibs
-Source1:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 # Manual requires to avoid hard require to bash-static
@@ -153,6 +151,15 @@ if [ `whoami` != "root" ]; then
   echo "WARNING: Not building as root, tests did not run!"
   exit 0
 fi
+if [ ! -e $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf ]; then
+%if 0%{?suse_version}
+  echo "ERROR: No default build conf, tests did not run!"
+  exit 1
+%else
+  echo "WARNING: No default build conf, tests did not run!"
+  exit 0
+%endif
+fi
 # get back the default.conf link
 cp -av $RPM_BUILD_ROOT/usr/lib/build/configs/default.conf configs/
 # do not get confused when building this already with build:
diff --git a/debian.changelog b/debian.changelog
index f5d6d634..4683c66e 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20150317) unstable; urgency=low
+build (20150615) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20150317.tar.gz b/obs-build-20150317.tar.gz
deleted file mode 100644
index 84f67492..00000000
--- a/obs-build-20150317.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58b11594a94071019410bc8350703baaea8760de83a4f05d9021413257258d18
-size 210590
diff --git a/obs-build-20150615.tar.gz b/obs-build-20150615.tar.gz
new file mode 100644
index 00000000..6ed611c2
--- /dev/null
+++ b/obs-build-20150615.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29f269e5cbd5b884867404ee855fd4bb7386b4947be31ea7e6ab00a45877485b
+size 214755