diff --git a/_service b/_service
index b371c7c2..6ab45127 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,12 @@
 <services>
-  <service name="tar_scm"><param name="version">2010.12.15</param><param name="url">git://gitorious.org/opensuse/build.git</param><param name="scm">git</param></service>
-<service name="recompress"><param name="compression">gz</param><param name="file">*.tar</param></service>
-<service name="set_version"/>
+  <service name="tar_scm" mode="disabled">
+    <param name="version">2011.01.20</param>
+    <param name="url">git://gitorious.org/opensuse/build.git</param>
+    <param name="scm">git</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="compression">gz</param>
+    <param name="file">*.tar</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
 </services>
diff --git a/_service:recompress:tar_scm:build-2010.12.15.tar.gz b/_service:recompress:tar_scm:build-2010.12.15.tar.gz
deleted file mode 100644
index b51581f2..00000000
--- a/_service:recompress:tar_scm:build-2010.12.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b051d07de752d3492ffd167316cfc6f302851a914fac550f16fddaef7313058c
-size 591817
diff --git a/_service:set_version:build.dsc b/_service:set_version:build.dsc
deleted file mode 100644
index 8532f8a0..00000000
--- a/_service:set_version:build.dsc
+++ /dev/null
@@ -1,9 +0,0 @@
-Format: 1.0
-Source: build
-Version: 2010.12.15
-Binary: build
-Maintainer: Adrian Schroeter <adrian@suse.de>
-Architecture: all
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4)
-
diff --git a/_service:set_version:build.spec b/_service:set_version:build.spec
deleted file mode 100644
index 2c05c922..00000000
--- a/_service:set_version:build.spec
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# spec file for package build (Version 2010.12.15)
-#
-# Copyright (c) 2010 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/
-#
-
-# norootforbuild
-
-
-Name:           build
-License:        GPLv2+
-Group:          Development/Tools/Building
-AutoReqProv:    on
-Summary:        A Script to Build SUSE Linux RPMs
-Version: 2010.12.15
-Release:        1
-#!BuildIgnore:  build-mkbaselibs
-Source:         build-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-# Manual requires to avoid hard require to bash-static
-AutoReqProv:    off
-# Keep the following dependencies in sync with obs-worker package
-Requires:       bash
-Requires:       perl
-Requires:       binutils
-Requires:       tar
-# None of them are actually required for core features.
-# Perl helper scripts use them.
-%if 0%{?suse_version} > 1000
-Recommends:     perl(Date::Language)
-Recommends:     perl(Date::Parse)
-Recommends:     perl(LWP::UserAgent)
-Recommends:     perl(Pod::Usage)
-Recommends:     perl(Time::Zone)
-Recommends:     perl(URI)
-Recommends:     perl(XML::Parser)
-Recommends:     bsdtar
-%endif
-
-%description
-This package provides a script for building RPMs for SUSE Linux in a
-chroot environment.
-
-
-%if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
-Requires:       build-mkbaselibs
-Recommends:     build-mkdrpms
-
-%package mkbaselibs
-License:        GPLv2+
-Group:          Development/Tools/Building
-Summary:        Tools to generate base lib packages
-# NOTE: this package must not have dependencies which may break boot strapping (eg. perl modules)
-
-%description mkbaselibs
-This package contains the parts which may be installed in the inner build system
-for generating base lib packages.
-
-%package mkdrpms
-License:        GPLv2+
-Group:          Development/Tools/Building
-Summary:        Tools to generate delta rpms
-Requires:       deltarpm
-# XXX: we wanted to avoid that but mkdrpms needs Build::Rpm::rpmq
-Requires:       build
-
-%description mkdrpms
-This package contains the parts which may be installed in the inner build system
-for generating delta rpm packages.
-
-%endif
-
-%prep
-%setup -q
-
-%build
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT/usr/lib/build/configs/
-%if 0%{?sles_version}
- ln -s sles%{sles_version}.conf default.conf
-%else
-%if 0%{?suse_version}
- V=%suse_version
- ln -s sl${V:0:2}.${V:2:1}.conf default.conf
-%endif
-%endif
-
-%files
-%defattr(-,root,root)
-%doc README
-/usr/bin/build
-/usr/bin/buildvc
-/usr/bin/unrpm
-/usr/lib/build
-%{_mandir}/man1/build.1*
-
-%if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
-%exclude /usr/lib/build/mkbaselibs
-%exclude /usr/lib/build/baselibs*
-%exclude /usr/lib/build/mkdrpms
-
-%files mkbaselibs
-%defattr(-,root,root)
-%dir /usr/lib/build
-/usr/lib/build/mkbaselibs
-/usr/lib/build/baselibs*
-
-%files mkdrpms
-%defattr(-,root,root)
-%dir /usr/lib/build
-/usr/lib/build/mkdrpms
-%endif
-
-%changelog
diff --git a/build-2011.01.20.tar.gz b/build-2011.01.20.tar.gz
new file mode 100644
index 00000000..9f2c8587
--- /dev/null
+++ b/build-2011.01.20.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c85b5caf6d889df5654451289adda478442208a0be5d77bc5509f645bf8f342
+size 251392
diff --git a/build.changes b/build.changes
index 1d2ec314..70dec5f1 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 28 09:02:32 UTC 2011 - adrian@suse.de
+
+- do not use current git branch for stable build package in distributions
+- require bsdtar for vm builds to ensure a safe build
+
 -------------------------------------------------------------------
 Wed Dec 15 14:05:09 CET 2010 - mls@suse.de
 
diff --git a/build.dsc b/build.dsc
index 2eda7b74..af2c10c0 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 2010.10.12
+Version: 2011.01.20
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 1070a6d5..237c2760 100644
--- a/build.spec
+++ b/build.spec
@@ -23,8 +23,8 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        A Script to Build SUSE Linux RPMs
-Version:        2010.12.15
-Release:        1
+Version: 2011.01.20
+Release: 0
 #!BuildIgnore:  build-mkbaselibs
 Source:         build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/debian.tar.gz b/debian.tar.gz
deleted file mode 100644
index 6ff99671..00000000
--- a/debian.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e76356912637c3554da7a0cef6cbc7f12e5adf9fc4c6b14fb09084c6b6bcc845
-size 1524