diff --git a/databases/memcachedb/Makefile b/databases/memcachedb/Makefile
index 5f8a7f224ad4..cdd373ed1b22 100644
--- a/databases/memcachedb/Makefile
+++ b/databases/memcachedb/Makefile
@@ -6,33 +6,31 @@
 #
 
 PORTNAME=	memcachedb
-PORTVERSION=	0.1.1
+DISTVERSION=	1.0.0-beta
 CATEGORIES=	databases
-MASTER_SITES=	http://memcachedb.googlecode.com/files/
+MASTER_SITES=	http://memcachedb.googlecode.com/files/	\
+		http://freebsd.csie.nctu.edu.tw/~gslin/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distributed storage system designed for persistent
 
 LIB_DEPENDS=	event-1.3e:${PORTSDIR}/devel/libevent
 
+CFLAGS=		-I"${BDB_INCLUDE_DIR}"
+CONFIUGRE_ARGS=	--enable-threads --with-bdb="${LOCALBASE}" \
+		--with-libevent="${LOCALBASE}"
+CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE=	yes
+LDFLAGS=	-l"${BDB_LIB_NAME}" -L"${LOCALBASE}/lib"
 MCDBDIR?=	/var/db/memcachedb
-PLIST_SUB+=	MCDBDIR="${MCDBDIR}"
 USE_BDB=	46+
-USE_DOS2UNIX=	YES
 USE_RC_SUBR=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-	${REINPLACE_CMD} \
-		-e "s,%%BDB_LIB_NAME%%,${BDB_LIB_NAME}," \
-		-e "s,%%BDB_LIB_DIR%%,${BDB_LIB_DIR}," \
-		-e "s,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR}," \
-		${WRKSRC}/Makefile
+	${CHMOD} a+x ${WRKSRC}/install-sh
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/memcachedb ${PREFIX}/sbin
+post-install:
 	${MKDIR} ${MCDBDIR} || ${TRUE}
 	${CHOWN} nobody:nobody ${MCDBDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/memcachedb/distinfo b/databases/memcachedb/distinfo
index 9f2e65b54ff6..f4c3d416314e 100644
--- a/databases/memcachedb/distinfo
+++ b/databases/memcachedb/distinfo
@@ -1,3 +1,3 @@
-MD5 (memcachedb-0.1.1.tar.gz) = 492145d7bf08719b7b2d9080a920f2ce
-SHA256 (memcachedb-0.1.1.tar.gz) = 5e4ed88ca062f9d2dd2f70222d4fef9f480c4f29e970f76ba306d0f6798823ad
-SIZE (memcachedb-0.1.1.tar.gz) = 15789
+MD5 (memcachedb-1.0.0-beta.tar.gz) = 2b23109d94a6d5b0f51fc6ecf7e1ae3a
+SHA256 (memcachedb-1.0.0-beta.tar.gz) = b46d560c2b6dc56b57f133f8ba3ea079627676d50d78809c5c685da8c093dbfc
+SIZE (memcachedb-1.0.0-beta.tar.gz) = 118130
diff --git a/databases/memcachedb/files/patch-Makefile b/databases/memcachedb/files/patch-Makefile
deleted file mode 100644
index 3ef1ea9ec76c..000000000000
--- a/databases/memcachedb/files/patch-Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2007-11-06 16:55:06.000000000 +0800
-+++ Makefile	2007-11-06 16:56:00.000000000 +0800
-@@ -1,15 +1,15 @@
- # $Id: Makefile 11833 2005-11-28 00:22:02Z midom $
- # $Id: Makefile 11833 2007-09-06 10:56:02Z steve $
- 
--LIBS=-ldb -levent
--DBLIBPATH=/usr/local/BerkeleyDB.4.6/lib
--DBINCPATH=/usr/local/BerkeleyDB.4.6/include
-+LIBS=-l%%BDB_LIB_NAME%% -levent
-+DBLIBPATH=%%BDB_LIB_DIR%%
-+DBINCPATH=%%BDB_INCLUDE_DIR%%
- 
- LDFLAGS= -L/usr/local/lib/ -L${DBLIBPATH}
--CFLAGS =-Wall -O2 -I/usr/local/include -I${DBINCPATH} 
-+CFLAGS+=-Wall -I/usr/local/include -I${DBINCPATH} 
- 
- all: 
--	cc -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
-+	${CC} -o memcachedb memcachedb.c ${LDFLAGS} ${CFLAGS} ${LIBS}
- 
- clean:
- 	rm -f -- *.o memcachedb
diff --git a/databases/memcachedb/files/patch-memcachedb.c b/databases/memcachedb/files/patch-memcachedb.c
deleted file mode 100644
index b1a1e463531d..000000000000
--- a/databases/memcachedb/files/patch-memcachedb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- memcachedb.c.orig	2007-09-21 18:52:54.000000000 +0800
-+++ memcachedb.c	2007-09-27 09:26:43.000000000 +0800
-@@ -39,7 +39,6 @@
- #include <assert.h>
- #include <db.h>
- #include <signal.h>
--#include <malloc.h>
- 
- #include "memcachedb.h"
- 
diff --git a/databases/memcachedb/files/patch-memcachedb.h b/databases/memcachedb/files/patch-memcachedb.h
deleted file mode 100644
index 46b0c00d95e1..000000000000
--- a/databases/memcachedb/files/patch-memcachedb.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- memcachedb.h.orig	2007-09-22 04:01:02.000000000 +0800
-+++ memcachedb.h	2007-09-22 04:01:15.000000000 +0800
-@@ -40,8 +40,8 @@
- extern struct stats stats;
- extern struct settings settings;
- 
--#define END_LEN 32
--#define END_LEN_STR "31"
-+#define END_LEN 128
-+#define END_LEN_STR "127"
- 
- typedef struct _stritem {
-     int nbytes;			/* size of data */
diff --git a/databases/memcachedb/pkg-plist b/databases/memcachedb/pkg-plist
index 2573c164c2ff..65386335d1d9 100644
--- a/databases/memcachedb/pkg-plist
+++ b/databases/memcachedb/pkg-plist
@@ -1,4 +1,4 @@
 @comment $FreeBSD$
 @stopdaemon memcachedb
-sbin/memcachedb
-@dirrmtry %%MCDBDIR%%
+bin/memcachedb
+@dirrmtry /var/db/memcachedb