diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 42bae24ba452..dd95dff4628d 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	memcached
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.4
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@@ -21,19 +21,20 @@ USE_RC_SUBR=	memcached
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--with-libevent=${LOCALBASE} --program-prefix=
 
-OPTIONS=	REPCACHED	"Enable data replication feature"	off
+OPTIONS=	REPCACHED	"Enable data replication feature"	off \
+		SASL		"Enable SASL support"			off
 
 MAN1=		memcached.1
 
 PLIST_FILES=	bin/memcached \
 		bin/memcached-tool
 
-PORTDOCS=	memory_management.txt protocol.txt
+PORTDOCS=	protocol.txt threads.txt readme.txt
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 800000
-BROKEN=		does not link
+CFLAGS+=       -fstack-protector
 .endif
 
 .if defined(WITH_REPCACHED)
@@ -45,6 +46,17 @@ PATCHFILES+=		repcached-2.2-${PORTVERSION}.patch.gz
 CONFIGURE_ARGS+=	--enable-replication --disable-threads
 .endif
 
+.if defined(WITH_SASL) && !defined(WITHOUT_SASL)
+LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+CONFIGURE_ARGS+=	--enable-sasl
+CFLAGS+=		-I${LOCALBASE}/include
+CPPFLAGS=		${CFLAGS}
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+.else
+CONFIGURE_ARGS+=	--disable-sasl
+.endif
+
 post-configure:
 	@${REINPLACE_CMD} -e 's#doc/memcached.1##' ${WRKSRC}/Makefile
 
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index 00eca2a6d38b..01ff760e8efd 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1,3 +1,3 @@
-MD5 (memcached-1.4.1.tar.gz) = fb1b7e9fcf47b95c5ad3bbeb76342088
-SHA256 (memcached-1.4.1.tar.gz) = 6bb6e52290bbe987990e83d57856f762402c9a625e9c4f8da785dc7f53acbd83
-SIZE (memcached-1.4.1.tar.gz) = 277221
+MD5 (memcached-1.4.4.tar.gz) = 5ca5b24de347e97ac1f48f3785b4178a
+SHA256 (memcached-1.4.4.tar.gz) = 6bbca41460ded17c6d56c76d96309cd3dee518603fa093938e252262935f8bac
+SIZE (memcached-1.4.4.tar.gz) = 297920
diff --git a/databases/memcached/files/patch-thread.c b/databases/memcached/files/patch-thread.c
deleted file mode 100644
index 93aa41f3d06d..000000000000
--- a/databases/memcached/files/patch-thread.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- thread.c.orig	2009-01-27 00:34:19.000000000 -0200
-+++ thread.c	2009-01-27 00:34:04.000000000 -0200
-@@ -644,6 +644,7 @@
-         perror("Can't allocate thread descriptors");
-         exit(1);
-     }
-+    memset(threads, 0, sizeof(LIBEVENT_THREAD) * nthreads);
- 
-     threads[0].base = main_base;
-     threads[0].thread_id = pthread_self();