diff --git a/src/vmime-1.patch b/src/vmime-1.patch
index 8fd60f0c..c2026fb3 100644
--- a/src/vmime-1.patch
+++ b/src/vmime-1.patch
@@ -1,36 +1,14 @@
 This file is part of MXE.
 See index.html for further information.
 
-From aec914bd8b868924f4b49d861c1e01c61113db48 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 14 May 2013 09:21:46 +0200
-Subject: [PATCH 1/2] predefine VMIME_STATIC for convenience
-
-
-diff --git a/vmime.pc.in b/vmime.pc.in
-index fc1103e..11dd0ea 100644
---- a/vmime.pc.in
-+++ b/vmime.pc.in
-@@ -9,5 +9,5 @@ Version: @VMIME_PACKAGE_VERSION@
- Requires.private: @VMIME_PKGCONFIG_REQUIRES@
- Libs: -L${libdir} -l@VMIME_LIBRARY_NAME@
- Libs.private: @VMIME_PKGCONFIG_LIBS@
--Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@
-+Cflags: -I${includedir}/ @VMIME_PKGCONFIG_CFLAGS@ -DVMIME_STATIC
- 
--- 
-1.8.4.5
-
-
-From 344e0d7bc62adda4e1437b49350a29089d7ce3af Mon Sep 17 00:00:00 2001
+From bc98fcbc262514378bbb9a5a011cdaf7aef5e744 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 26 Mar 2014 23:45:05 +0100
-Subject: [PATCH 2/2] workaround for stricmp decl problem on mingw32
- (mingw.org)
+Subject: [PATCH] workaround for stricmp decl problem on mingw32 (mingw.org)
 
 
 diff --git a/src/vmime/platforms/windows/windowsCodepages.hpp b/src/vmime/platforms/windows/windowsCodepages.hpp
-index dfd6afd..f01bc47 100644
+index e66b230..211db5e 100644
 --- a/src/vmime/platforms/windows/windowsCodepages.hpp
 +++ b/src/vmime/platforms/windows/windowsCodepages.hpp
 @@ -32,6 +32,10 @@
@@ -45,5 +23,5 @@ index dfd6afd..f01bc47 100644
  
  namespace vmime {
 -- 
-1.8.4.5
+2.1.2
 
diff --git a/src/vmime.mk b/src/vmime.mk
index c0b3dfbb..fc5c4781 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -23,8 +23,8 @@ define $(PKG)_BUILD
         -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=False \
         -DVMIME_HAVE_MLANG_H=False \
         -DCMAKE_CXX_FLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \
-        -DVMIME_BUILD_STATIC_LIBRARY=ON \
-        -DVMIME_BUILD_SHARED_LIBRARY=OFF \
+        -DVMIME_BUILD_STATIC_LIBRARY=$(if $(BUILD_STATIC),ON,OFF) \
+        -DVMIME_BUILD_SHARED_LIBRARY=$(if $(BUILD_SHARED),ON,OFF) \
         -DVMIME_BUILD_SAMPLES=OFF \
         -DVMIME_BUILD_DOCUMENTATION=OFF \
         -DCMAKE_MODULE_PATH='$(1)/cmake' \
@@ -40,6 +40,7 @@ define $(PKG)_BUILD
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc
+    $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC/g' $(1)/vmime.pc)
     $(MAKE) -C '$(1)' install
 
     $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp'
@@ -48,5 +49,3 @@ define $(PKG)_BUILD
         `'$(TARGET)-pkg-config' vmime --cflags --libs`
     $(INSTALL) -m755 '$(1)/examples/test-vmime.exe' '$(PREFIX)/$(TARGET)/bin/'
 endef
-
-$(PKG)_BUILD_SHARED =