diff --git a/libzypp-17.36.2.tar.bz2 b/libzypp-17.36.2.tar.bz2
index 7f3f1cf..b887a00 100644
--- a/libzypp-17.36.2.tar.bz2
+++ b/libzypp-17.36.2.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92db4c422ebb35098d7497ceb87e6d30049cbdb7fb8cbc462684c323271989fa
-size 5688022
+oid sha256:6ef95cd88fb24f517632b6d1ee6d6910b86b0b8b3e8f30591297e2954881f581
+size 5691308
diff --git a/libzypp.spec b/libzypp.spec
index 47e1cc3..f6fb1a8 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -291,6 +291,7 @@ Developer documentation for libzypp.
 %build
 mkdir build
 cd build
+
 %if 0%{?suse_version} == 1600
 # bsc#1216091: rpm-4.18' does not execute 'rpm --runposttrans'
 # scripts chroot if --root is used.
@@ -300,7 +301,14 @@ export CXXFLAGS="%{optflags} -DWORKAROUNDDUMPPOSTTRANS_BUG_1216091"
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
 %endif
-unset EXTRA_CMAKE_OPTIONS
+
+EXTRA_CMAKE_OPTIONS=
+%if 0%{?suse_version}
+EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DLIBZYPP_CODESTREAM=0%{?suse_version}:0%{?sle_version}:0%{?is_opensuse}"
+%endif
+%if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150600
+EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DLIBZYPP_CONFIG_USE_DELTARPM_BY_DEFAULT=1"
+%endif
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DENABLE_BUILD_DOCS=TRUE \