diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 68bf3e41f..56e0789b4 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -167,7 +167,7 @@ endif
 
 esound:
 # Build on Mageia and CentOS >= 7 and Fedora >= 23
-ifneq ($(wildcard /etc/mageia-release /boot/vmlinuz*.el7*  /boot/vmlinuz*.fc23*),)
+ifneq (,$(filter $(DIST),.mga .el7 .fc2 .osstw))
 	$(call buildpkg,3rdparty/esound)
 endif
 
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 27508d1d7..1588ff833 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -51,7 +51,7 @@ rpmbuild -ba \
   --define "packager Francois\ Andriot\ <francois.andriot@free.fr>" \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
-  --define "preversion ${PREVERSION:-}" \
+  --define "prevers${PREVERSION:+ion} ${PREVERSION:-0}" \
   --define "tde_patch 1" \
   --define "with_mpeg 1" \
   "${TEMPDIR}/${SPECFILE##*/}"
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh
index 9622efd56..a3b888c75 100755
--- a/redhat/docker/opensuse32.sh
+++ b/redhat/docker/opensuse32.sh
@@ -8,14 +8,23 @@ INSTALLROOT="/dev/shm/${IMAGE}"
 sudo rm -rf "${INSTALLROOT}"
 sudo mkdir -p "${INSTALLROOT}"
 
+if [ "${VERSION}" = "tumbleweed" ]; then
+  URL="http://download.opensuse.org/tumbleweed"
+else
+  URL="http://download.opensuse.org/distribution/leap/${VERSION}"
+fi
+
 sudo zypper --root "${INSTALLROOT}" \
-  ar "http://download.opensuse.org/distribution/leap/${VERSION}/repo/oss/" "oss"
-sudo zypper --root "${INSTALLROOT}" \
-  ar "http://download.opensuse.org/distribution/leap/${VERSION}/repo/non-oss/" "non-oss"
-sudo zypper --root "${INSTALLROOT}" \
-  ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss"
+  ar "${URL}/repo/oss/" "oss"
 sudo zypper --root "${INSTALLROOT}" \
-  ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss"
+  ar "${URL}/repo/non-oss/" "non-oss"
+
+if [ "${VERSION}" != "tumbleweed" ]; then
+  sudo zypper --root "${INSTALLROOT}" \
+    ar "http://download.opensuse.org/update/leap/${VERSION}/oss/" "update-oss"
+  sudo zypper --root "${INSTALLROOT}" \
+    ar "http://download.opensuse.org/update/leap/${VERSION}/non-oss/" "update-non-oss"
+fi
 setarch i686 sudo zypper --root "${INSTALLROOT}" \
   --gpg-auto-import-keys ref
 setarch i686 sudo zypper --root "${INSTALLROOT}" \