diff --git a/_constraints b/_constraints
index 3fa17cc..1f52539 100644
--- a/_constraints
+++ b/_constraints
@@ -4,6 +4,9 @@
     <physicalmemory>
       <size unit="M">2000</size>
     </physicalmemory>
+    <disk>
+      <size unit="G">5</size>
+    </disk>
   </hardware>
   <sandbox>kvm</sandbox>
   <hostlabel exclude="true">SLOW_CPU</hostlabel>
diff --git a/boost.changes b/boost.changes
index 6c398d2..29c3425 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jul 30 05:09:29 UTC 2014 - coolo@suse.com
+
+- add baselibs.conf as source
+
+-------------------------------------------------------------------
+Tue Jul 22 13:52:26 UTC 2014 - fcrozat@suse.com
+
+- Ensure there is enough disk space available for build.
+
+-------------------------------------------------------------------
+Tue Jul 22 12:22:13 UTC 2014 - fcrozat@suse.com
+
+- use only JOBS=2 to avoid gcc being killed with OOM when memory is
+  between 4G and 7G.
+
 -------------------------------------------------------------------
 Tue Apr 29 14:34:41 UTC 2014 - dvaleev@suse.com
 
diff --git a/boost.spec b/boost.spec
index a61850b..d6e6c9e 100644
--- a/boost.spec
+++ b/boost.spec
@@ -102,6 +102,7 @@ Source2:        %{name}_%{short_version}_man.tar.bz2
 Source3:        http://downloads.sourceforge.net/project/boost/boost-docs/%{version}/%{name}_%{file_version}_pdf.tar.bz2
 Source4:        existing_extra_docs
 #Source5:        NEWS
+Source100:      baselibs.conf
 Patch1:         boost-thread.patch
 Patch2:         boost-no_type_punning.patch
 Patch8:         boost-no_segfault_in_Regex_filter.patch
@@ -466,6 +467,9 @@ Mem=$(grep MemTotal /proc/meminfo | awk '{print $2}')
 # require 4G for parallel build
 if test "$Mem" -lt 4000000; then
   JOBS=1
+elif test "$Mem" -lt 7000000; then
+# lower number of jobs if memory is less than 7G but more than 4G
+   JOBS=2
 fi
 if test "$JOBS" = 0; then
   JOBS=1