diff --git a/libvmime-0.9.1+svn603.tar.bz2 b/libvmime-0.9.1+svn603.tar.bz2
index bf32293..a15c532 100644
--- a/libvmime-0.9.1+svn603.tar.bz2
+++ b/libvmime-0.9.1+svn603.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c321da84af04562ab9faeb62702952c3a2faf894ededa0fc675d148b468abe6
-size 351937
+oid sha256:4b897e2333efd223d853082a9d3172399aa6b0855f9ee1ff5f2c58f7ebbd4329
+size 888670
diff --git a/libvmime.changes b/libvmime.changes
index 9b079a3..83cf18f 100644
--- a/libvmime.changes
+++ b/libvmime.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Aug 11 14:44:08 UTC 2012 - jengelh@inai.de
+
+- Make the package build on RHEL6
+
+-------------------------------------------------------------------
+Thu Jul 12 16:40:45 UTC 2012 - jengelh@inai.de
+
+- Enable always generating 7-bit parameters
+  (https://jira.zarafa.com/browse/ZCP-9475)
+
 -------------------------------------------------------------------
 Thu May 10 00:13:33 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/libvmime.spec b/libvmime.spec
index 7392cd3..79b9f09 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -26,7 +26,7 @@ Release:        0
 Url:            http://vmime.sf.net/
 
 #Svn-Clone:	https://vmime.svn.sourceforge.net/svnroot/vmime/trunk
-#Source:		http://downloads.sf.net/vmime/%name-%version.tar.bz2
+#Source:	http://downloads.sf.net/vmime/%name-%version.tar.bz2
 Source:         %name-0.9.1+svn603.tar.bz2
 Source2:        spice_source.sh
 Patch1:         libvmime-nodatetime.diff
@@ -58,7 +58,7 @@ BuildRequires:  libselinux-devel
 BuildRequires:  gnutls-devel
 %endif
 %endif
-%if 0%{?fedora_version} > 0
+%if 0%{?fedora_version} > 0 || 0%{?redhat_version} || 0%{?centos_version}
 BuildRequires:  gettext
 BuildRequires:  gnutls-devel
 %endif
@@ -105,13 +105,14 @@ complete mail client.
 %patch7
 
 %build
-export CXXFLAGS="%optflags"
-export CFLAGS="%optflags"
+export CFLAGS="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1";
+export CXXFLAGS="$CFLAGS";
 # sendmail's awesome location.
 export PATH="$PATH:/usr/sbin";
-%if 0%{?suse_version} >= 1100
+%if 0%{?suse_version} >= 1100 || 0%{?!suse_version}
 scons autotools;
-# SL10: Rely on scons already having been run before the tarball was made.
+# SL10 and other too old distros:
+# Rely on scons already having been run before the tarball was made.
 %endif
 %configure --disable-static
 make %{?_smp_mflags};