diff --git databases/memcached/Makefile databases/memcached/Makefile
index 267ae65..79f71f1 100644
--- databases/memcached/Makefile
+++ databases/memcached/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.25
+PORTVERSION=	1.4.31
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
@@ -27,8 +27,7 @@ SASL_DESC=	Enable SASL Authentication
 USE_RC_SUBR=	memcached
 SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-USES=		cpe shebangfix autoreconf:build
-USE_AUTOTOOLS=	aclocal
+USES=		cpe shebangfix autoreconf
 SHEBANG_FILES=	scripts/memcached-tool
 
 USE_CSTD=	c99
@@ -37,6 +36,8 @@ CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} \
 		--program-prefix= \
 		--disable-coverage
 
+DOCS_BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
+
 DTRACE_CONFIGURE_ENABLE=	dtrace
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
@@ -57,19 +58,13 @@ CONFIGURE_ARGS+=	--enable-64bit
 BROKEN=			DTRACE broken with gcc/clang - reported upstream
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
-.endif
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in protocol-binary-range.txt protocol-binary.txt protocol.txt \
 		readme.txt threads.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 regression-test: test
 test: build
diff --git databases/memcached/distinfo databases/memcached/distinfo
index 9e86bec..6b61ba6 100644
--- databases/memcached/distinfo
+++ databases/memcached/distinfo
@@ -1,2 +1,3 @@
-SHA256 (memcached-1.4.25.tar.gz) = f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda
-SIZE (memcached-1.4.25.tar.gz) = 359709
+TIMESTAMP = 1476187643
+SHA256 (memcached-1.4.31.tar.gz) = 77ce5f820bafe94c33bf7bd86268d9bcdb3b76f68128d795b106db53d528707f
+SIZE (memcached-1.4.31.tar.gz) = 389502
diff --git databases/memcached/files/patch-thread.c databases/memcached/files/patch-thread.c
deleted file mode 100644
index 92bc5ea..0000000
--- databases/memcached/files/patch-thread.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thread.c.orig	2015-04-20 05:34:19 UTC
-+++ thread.c
-@@ -402,7 +402,7 @@ static void thread_libevent_process(int 
-         conn *c = conn_new(item->sfd, item->init_state, item->event_flags,
-                            item->read_buffer_size, item->transport, me->base);
-         if (c == NULL) {
--            if (IS_UDP(item->transport)) {
-+            if IS_UDP(item->transport) {
-                 fprintf(stderr, "Can't listen for events on UDP socket\n");
-                 exit(1);
-             } else {