diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 045e00876628..7881223c74e2 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	expat
-# Date created:		Thu Aug 26 14:38:07 CEST 1999
-# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
-#
+# Created by: Dirk Froemberg <dirk@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	expat
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.1.0
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -16,14 +11,20 @@ COMMENT=	XML 1.0 parser written in C
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	default
+USES=		pathfix
 USE_LDCONFIG=	yes
 MAN1=		xmlwf.1
 
+# Increment only when there are incompatible API changes.
 SHLIB_MAJOR=	6
 
-MAKE_ENV=	LIBCURRENT="${SHLIB_MAJOR}"
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e 's/@LIBCURRENT.*@/${SHLIB_MAJOR}/' \
+		-e '/^DESTDIR =/d' ${WRKSRC}/Makefile.in
+
 list-depend-ports:
 	cd ${PORTSDIR}; \
 	${FIND} . -mindepth 3 -maxdepth 3 -name Makefile -execdir ${SH} -c \
diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo
index f71ce951df2d..3d3b90ac98c5 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (expat-2.0.1.tar.gz) = 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
-SIZE (expat-2.0.1.tar.gz) = 446456
+SHA256 (expat-2.1.0.tar.gz) = 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
+SIZE (expat-2.1.0.tar.gz) = 562616
diff --git a/textproc/expat2/files/patch-Makefile.in b/textproc/expat2/files/patch-Makefile.in
deleted file mode 100644
index 19203cd94dc2..000000000000
--- a/textproc/expat2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Jun 10 21:10:33 2007
-+++ Makefile.in	Sun Jun 10 21:11:18 2007
-@@ -44,8 +44,6 @@
- APIHEADER = $(srcdir)/lib/expat.h $(srcdir)/lib/expat_external.h
- LIBRARY = libexpat.la
- 
--DESTDIR = $(INSTALL_ROOT)
--
- default:  buildlib xmlwf/xmlwf
- 
- buildlib: $(LIBRARY)
diff --git a/textproc/expat2/files/patch-xmlparse.c b/textproc/expat2/files/patch-xmlparse.c
deleted file mode 100644
index 1094c0f8caf2..000000000000
--- a/textproc/expat2/files/patch-xmlparse.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/xmlparse.c.orig	2007-05-08 11:25:35.000000000 +0900
-+++ lib/xmlparse.c	2011-08-29 23:22:09.007745673 +0900
-@@ -3703,6 +3703,9 @@
-         return XML_ERROR_UNCLOSED_TOKEN;
-       case XML_TOK_PARTIAL_CHAR:
-         return XML_ERROR_PARTIAL_CHAR;
-+      case -XML_TOK_PROLOG_S:
-+        tok = -tok;
-+        break;
-       case XML_TOK_NONE:
- #ifdef XML_DTD
-         /* for internal PE NOT referenced between declarations */
diff --git a/textproc/expat2/files/patch-xmltok_impl.c b/textproc/expat2/files/patch-xmltok_impl.c
deleted file mode 100644
index ec6ab41b30dd..000000000000
--- a/textproc/expat2/files/patch-xmltok_impl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/xmltok_impl.c.orig	2009-12-08 10:16:58.047943029 +0900
-+++ lib/xmltok_impl.c	2009-12-08 10:17:13.228143919 +0900
-@@ -1744,7 +1744,7 @@
-                        const char *end,
-                        POSITION *pos)
- {
--  while (ptr != end) {
-+  while (ptr < end) {
-     switch (BYTE_TYPE(enc, ptr)) {
- #define LEAD_CASE(n) \
-     case BT_LEAD ## n: \
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 765003325fa6..2b2003923984 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -5,3 +5,4 @@ lib/libexpat.a
 lib/libexpat.la
 lib/libexpat.so
 lib/libexpat.so.%%SHLIB_MAJOR%%
+libdata/pkgconfig/expat.pc