diff --git a/_service b/_service
new file mode 100644
index 0000000..f982a3e
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/kisli/vmime</param>
+		<param name="revision">a9b822140bf8926620fd21b880893d4c214dd8c0</param>
+		<param name="parent-tag">v0.9.2</param>
+		<param name="versionformat">0.9.2.@TAG_OFFSET@</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
diff --git a/libvmime.changes b/libvmime.changes
index 43b6ddf..6bcd7c4 100644
--- a/libvmime.changes
+++ b/libvmime.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Jun 25 12:21:09 UTC 2018 - jengelh@inai.de
+
+- Update to new git snapshot v0.9.2-50-ga9b8221
+  * Dropped support for boost::shared_ptr<>, enabled exclusive
+    C++11 use of std::shared_ptr.
+  * Handle parsing of (RFC-nonconforming) address lines containing
+    bare at signs, like "a@b.c <e@f.g>" or
+    "=?UTF-8?Q?a=c2=a0recipient_=28foo@bar.com=29?= <e@f.g>".
+  * Add SMTPS with AUTH PLAIN without SASL.
+
+-------------------------------------------------------------------
+Mon Apr 23 07:58:00 UTC 2018 - jengelh@inai.de
+
+- Add no-override-cflags.diff so that vmime becomes externally
+  buildable with other -O/-g levels.
+
 -------------------------------------------------------------------
 Thu Jul 13 14:11:54 UTC 2017 - jengelh@inai.de
 
diff --git a/libvmime.spec b/libvmime.spec
index bad2526..8a0b278 100644
--- a/libvmime.spec
+++ b/libvmime.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libvmime
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
 Name:           libvmime
 %define lname	libvmime1
 Summary:        Library for working with RFC 2822, MIME messages and IMAP/POP/SMTP
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Version:        0.9.2
+Version:        0.9.2.50
 Release:        0
 Url:            http://vmime.org/
 
-Source:         https://github.com/kisli/vmime/archive/v%version.tar.gz
+#Source:         https://github.com/kisli/vmime/archive/v%%version.tar.gz
+Source:         vmime-%version.tar.xz
 Patch1:         libvmime-nodatetime.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
@@ -103,7 +104,7 @@ popd
 %endif
 
 cf="%optflags -DVMIME_ALWAYS_GENERATE_7BIT_PARAMETER=1"
-cmake . \
+%cmake \
 	-DVMIME_SENDMAIL_PATH:STRING="%_sbindir/sendmail" \
 	-DVMIME_BUILD_SAMPLES:BOOL=OFF \
 %if 0%{?sle_version}
@@ -112,14 +113,10 @@ cmake . \
 	-DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \
 	-DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \
-	-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
-	-DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \
-%if 0%{?suse_version} >= 1310
-	-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \
-%else
-	-DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++0x" \
-%endif
-	-DCMAKE_C_FLAGS:STRING="$cf"
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$cf" \
+	-DCMAKE_CXX_FLAGS:STRING=" " \
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$cf" \
+	-DCMAKE_C_FLAGS:STRING=" "
 make %{?_smp_mflags} VERBOSE=1
 
 %install
@@ -128,7 +125,12 @@ b="%buildroot"
 mkdir -p "$b/%_docdir/%name"
 cp -a doc/book/book.pdf "$b/%_docdir/%name/"
 %endif
-make install DESTDIR="$b"
+%cmake_install
+
+# https://github.com/kisli/vmime/issues/200
+mv "$b/usr/%_libdir" "$b/usr/"
+mv "$b/usr/cmake" "$b/%_datadir/"
+
 find "$b" -type f -name "*.la" -delete
 
 %post   -n %lname -p /sbin/ldconfig
@@ -144,6 +146,7 @@ find "$b" -type f -name "*.la" -delete
 %_includedir/vmime
 %_libdir/libvmime.so
 %_libdir/pkgconfig/*.pc
+%_datadir/cmake/
 %if 0%{?with_pdf}
 %_docdir/%name
 %endif
diff --git a/v0.9.2.tar.gz b/v0.9.2.tar.gz
deleted file mode 100644
index b8148b9..0000000
--- a/v0.9.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9874bf911a7dbc257297ab00f7541875da221ee8251a4218cc65abff6e362399
-size 528830
diff --git a/vmime-0.9.2.50.tar.xz b/vmime-0.9.2.50.tar.xz
new file mode 100644
index 0000000..d45820a
--- /dev/null
+++ b/vmime-0.9.2.50.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:067a281760b5172e79ea42961650555684ad88afaf5cfe2fe2c58618b025a774
+size 379376