diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 065f5074490d..74bf5538ec61 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2017/06/18 06:01:33 spz Exp $
-#
+# $NetBSD: Makefile,v 1.35 2017/09/08 07:55:17 wiz Exp $
 
-DISTNAME=	expat-2.2.1
+DISTNAME=	expat-2.2.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expat/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,12 +10,14 @@ HOMEPAGE=	http://expat.sourceforge.net/
 COMMENT=	XML parser library written in C
 LICENSE=	mit
 
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 
 # C++ is needed for tests only
 #USE_LANGUAGES=		c c++
 #TEST_TARGET=		check
+#USE_TOOLS+=		bash
+#REPLACE_BASH=		test-driver-wrapper.sh
 
 PKGCONFIG_OVERRIDE+=	expat.pc.in
 
diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST
index 95319796bff4..688d53e9f1a7 100644
--- a/textproc/expat/PLIST
+++ b/textproc/expat/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2016/03/16 19:55:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/09/08 07:55:17 wiz Exp $
 bin/xmlwf
 include/expat.h
 include/expat_config.h
@@ -6,5 +6,7 @@ include/expat_external.h
 lib/libexpat.la
 lib/pkgconfig/expat.pc
 man/man1/xmlwf.1
+share/doc/expat/AUTHORS
+share/doc/expat/changelog
 share/doc/html/expat/reference.html
 share/doc/html/expat/style.css
diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo
index 73d02079ddf6..d898df13a77d 100644
--- a/textproc/expat/distinfo
+++ b/textproc/expat/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.29 2017/06/20 18:53:58 spz Exp $
+$NetBSD: distinfo,v 1.30 2017/09/08 07:55:17 wiz Exp $
 
-SHA1 (expat-2.2.1.tar.bz2) = f45eb724f182776a9cacec9ed70d549e87198987
-RMD160 (expat-2.2.1.tar.bz2) = 3c8e8e8c73775706d88b4938f514d85b49eac182
-SHA512 (expat-2.2.1.tar.bz2) = 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea
-Size (expat-2.2.1.tar.bz2) = 405441 bytes
-SHA1 (patch-configure) = 7efe7900bf6bcfa14e3bc296e2fa4b77f73266e3
-SHA1 (patch-configure.ac) = 7a50d414d756f7e73035cab5a9b581a6b1b40a8f
+SHA1 (expat-2.2.4.tar.bz2) = 3394d6390c041a8f5dec1d5fe7c4af0a23ae4504
+RMD160 (expat-2.2.4.tar.bz2) = fefe2400056c494a4d2c15e07f55d8119b411a7a
+SHA512 (expat-2.2.4.tar.bz2) = 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
+Size (expat-2.2.4.tar.bz2) = 505038 bytes
diff --git a/textproc/expat/patches/patch-configure b/textproc/expat/patches/patch-configure
deleted file mode 100644
index a1eb5f0eba83..000000000000
--- a/textproc/expat/patches/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2017/06/20 18:31:36 spz Exp $
-
---- configure.orig	2017-06-17 18:21:24.000000000 +0000
-+++ configure
-@@ -16341,7 +16341,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
-   }
- 
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- 
- $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
-@@ -16989,8 +16989,8 @@ fi
- 
- if test "x${enable_xml_context}" != "xno"; then :
- 
--  if test "x${enable_xml_context}" == "xyes" \
--      -o "x${enable_xml_context}" == "x"; then :
-+  if test "x${enable_xml_context}" = "xyes" \
-+      -o "x${enable_xml_context}" = "x"; then :
- 
-     enable_xml_context=1024
- 
diff --git a/textproc/expat/patches/patch-configure.ac b/textproc/expat/patches/patch-configure.ac
deleted file mode 100644
index 077ac51d99e4..000000000000
--- a/textproc/expat/patches/patch-configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2017/06/20 18:53:58 spz Exp $
-
---- configure.ac.orig	2017-06-17 16:07:38.000000000 +0000
-+++ configure.ac
-@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
- 
- 
- AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
--AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+AC_LINK_IFELSE([AC_LANG_SOURCE([
-   #include <stdlib.h>  /* for NULL */
-   #include <sys/random.h>
-   int main() {
-@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context],
-     [Do not retain context around the current parse point]),
-   [enable_xml_context=${enableval}])
- AS_IF([test "x${enable_xml_context}" != "xno"], [
--  AS_IF([test "x${enable_xml_context}" == "xyes" \
--      -o "x${enable_xml_context}" == "x"], [
-+  AS_IF([test "x${enable_xml_context}" = "xyes" \
-+      -o "x${enable_xml_context}" = "x"], [
-     enable_xml_context=1024
-   ])
-   AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}],