diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 27ac6300778c..8df76b3073ef 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmime
-PORTVERSION=	2.1.9
-PORTREVISION=	3
+PORTVERSION=	2.1.10
 CATEGORIES=	mail
 MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/v2.1/
 
diff --git a/mail/gmime2/distinfo b/mail/gmime2/distinfo
index 18c505c573af..8f5d483c5e02 100644
--- a/mail/gmime2/distinfo
+++ b/mail/gmime2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gmime-2.1.9.tar.gz) = 8bd24a56d5f56be9150deb9840a0812a
-SIZE (gmime-2.1.9.tar.gz) = 784545
+MD5 (gmime-2.1.10.tar.gz) = 4e82952bb0ca66f1b09fd64725bff9f8
+SIZE (gmime-2.1.10.tar.gz) = 795493
diff --git a/mail/gmime2/files/patch-docs_Makefile.in b/mail/gmime2/files/patch-docs_Makefile.in
index 22b8b8eba851..5e36106e3a10 100644
--- a/mail/gmime2/files/patch-docs_Makefile.in
+++ b/mail/gmime2/files/patch-docs_Makefile.in
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- docs/Makefile.in.orig
 +++ docs/Makefile.in
-@@ -152,7 +152,7 @@
+@@ -178,7 +178,7 @@
+ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- 
 -SUBDIRS = reference tutorial
 +SUBDIRS =
- 
  EXTRA_DIST = \
  	gmime-config.txt	\
+ 	gtkdocs_fix
diff --git a/mail/gmime2/files/patch-gmime_gmime-gpg-context.c b/mail/gmime2/files/patch-gmime_gmime-gpg-context.c
new file mode 100644
index 000000000000..ab93037f479a
--- /dev/null
+++ b/mail/gmime2/files/patch-gmime_gmime-gpg-context.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- gmime/gmime-gpg-context.c.orig
++++ gmime/gmime-gpg-context.c
+@@ -25,8 +25,6 @@
+ #include <config.h>
+ #endif
+ 
+-#define _POSIX_SOURCE
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/mail/gmime2/files/patch-reference-Makefile.in b/mail/gmime2/files/patch-reference-Makefile.in
index c4cd763893ac..2dac0eff4e5e 100644
--- a/mail/gmime2/files/patch-reference-Makefile.in
+++ b/mail/gmime2/files/patch-reference-Makefile.in
@@ -1,9 +1,12 @@
---- docs/reference/Makefile.in.orig	Fri Dec 10 14:06:17 2004
-+++ docs/reference/Makefile.in	Fri Dec 10 14:06:33 2004
-@@ -87,7 +87,7 @@
- GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
+
+$FreeBSD$
+
+--- docs/reference/Makefile.in.orig
++++ docs/reference/Makefile.in
+@@ -104,7 +104,7 @@
  GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
- 
+ GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
+ GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
 -HTML_DIR = $(datadir)/gtk-doc/html
 +HTML_DIR = @HTML_DIR@
  INSTALL_DATA = @INSTALL_DATA@
diff --git a/mail/gmime2/pkg-plist b/mail/gmime2/pkg-plist
index c48ca56caf64..20d0e1b7c5d5 100644
--- a/mail/gmime2/pkg-plist
+++ b/mail/gmime2/pkg-plist
@@ -22,7 +22,6 @@ include/gmime-2.0/gmime/gmime-filter-yenc.h
 include/gmime-2.0/gmime/gmime-filter.h
 include/gmime-2.0/gmime/gmime-gpg-context.h
 include/gmime-2.0/gmime/gmime-header.h
-include/gmime-2.0/gmime/gmime-host-utils.h
 include/gmime-2.0/gmime/gmime-iconv-utils.h
 include/gmime-2.0/gmime/gmime-iconv.h
 include/gmime-2.0/gmime/gmime-message-part.h
@@ -46,7 +45,6 @@ include/gmime-2.0/gmime/gmime-stream-mem.h
 include/gmime-2.0/gmime/gmime-stream-mmap.h
 include/gmime-2.0/gmime/gmime-stream-null.h
 include/gmime-2.0/gmime/gmime-stream.h
-include/gmime-2.0/gmime/gmime-type-utils.h
 include/gmime-2.0/gmime/gmime-utils.h
 include/gmime-2.0/gmime/gmime.h
 include/gmime-2.0/gmime/internet-address.h