diff --git a/dont-fixup.diff b/dont-fixup.diff
new file mode 100644
index 0000000..11d2b2d
--- /dev/null
+++ b/dont-fixup.diff
@@ -0,0 +1,20 @@
+References: https://github.com/kisli/vmime/issues/149
+
+libkcinetmapi does a much better fixup on its own.
+---
+ src/vmime/text.cpp |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: vmime-0.9.2.g500/src/vmime/text.cpp
+===================================================================
+--- vmime-0.9.2.g500.orig/src/vmime/text.cpp
++++ vmime-0.9.2.g500/src/vmime/text.cpp
+@@ -401,8 +401,6 @@ text* text::decodeAndUnfold(const parsin
+ 	out->removeAllWords();
+ 
+ 	std::vector <shared_ptr <word> > words = word::parseMultiple(ctx, in, 0, in.length(), NULL);
+-	fixBrokenWords(words);
+-
+ 	copy_vector(words, out->m_words);
+ 
+ 	return (out);
diff --git a/libvmime.changes b/libvmime.changes
index 327eb69..8fb6310 100644
--- a/libvmime.changes
+++ b/libvmime.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Oct 30 18:36:29 UTC 2016 - jengelh@inai.de
+
+- Update to new git snapshot
+  047cacb1dba516ca902b36a290f2b81555658c1e [0.9.2~g500]
+* Skip multiple (bogus) colons after header field name
+- Add dont-fixup.diff
+
 -------------------------------------------------------------------
 Wed Jun 22 17:05:17 UTC 2016 - jengelh@inai.de
 
diff --git a/libvmime.spec b/libvmime.spec
index c3c1fac..c08bc42 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -16,14 +16,14 @@
 #
 
 
-%define version_unconverted 0.9.2~g490
+%define version_unconverted 0.9.2~g500
 
 Name:           libvmime
 %define lname	libvmime-suse3
 Summary:        Library for working with MIME messages and IMAP/POP/SMTP
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
-Version:        0.9.2~g490
+Version:        0.9.2~g500
 Release:        0
 Url:            http://vmime.org/
 
@@ -31,6 +31,7 @@ Url:            http://vmime.org/
 Source:         vmime-%version.tar.xz
 Patch1:         libvmime-nodatetime.diff
 Patch2:         libvmime-sotag.diff
+Patch3:         dont-fixup.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 %if 0%{?suse_version} < 1310
@@ -41,10 +42,11 @@ BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  inkscape
 BuildRequires:  libgnutls-devel
+%if 0%{?is_opensuse}
 BuildRequires:  libgsasl-devel
+%endif
 BuildRequires:  libopenssl-devel
 BuildRequires:  pkg-config
-BuildRequires:  postfix
 %if 0%{?suse_version} >= 1130
 %define with_pdf 1
 %if 0%{?suse_version} < 1300
@@ -99,7 +101,7 @@ complete mail client.
 
 %prep
 %setup -qn vmime-%version
-%patch -P 1 -P 2 -p1
+%patch -P 1 -P 2 -P 3 -p1
 
 %build
 %if 0%{?with_pdf}
@@ -109,11 +111,12 @@ popd
 %endif
 
 cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"
-# sendmail's awesome location.
-export PATH="$PATH:/usr/sbin"
 cmake . \
+	-DVMIME_SENDMAIL_PATH:STRING="%_sbindir/sendmail" \
 	-DVMIME_BUILD_SAMPLES:BOOL=OFF \
+%if 0%{?is_opensuse}
 	-DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \
+%endif
 	-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
 	-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
 	-DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \
diff --git a/vmime-0.9.2~g490.tar.xz b/vmime-0.9.2~g490.tar.xz
deleted file mode 100644
index c4533af..0000000
--- a/vmime-0.9.2~g490.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b65eefc5214938a01c9a4082060b3b8251a8e9a64b538cb996ac4a92edf5515
-size 391000
diff --git a/vmime-0.9.2~g500.tar.xz b/vmime-0.9.2~g500.tar.xz
new file mode 100644
index 0000000..08d8fcf
--- /dev/null
+++ b/vmime-0.9.2~g500.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df76ff3097ac2bdee5c7d5549e950a3f709c19135b79c173b3a0f1ef948c8860
+size 390976