diff --git a/databases/hamsterdb/Makefile b/databases/hamsterdb/Makefile
index 7dc34762ad33..0af9bcc9eecb 100644
--- a/databases/hamsterdb/Makefile
+++ b/databases/hamsterdb/Makefile
@@ -6,22 +6,29 @@
 #
 
 PORTNAME=	hamsterdb
-PORTVERSION=	1.0.9
+PORTVERSION=	1.1.0
 CATEGORIES=	databases
 MASTER_SITES=	http://hamsterdb.com/public/dl/
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A Lightweight Embedded Database Engine
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
+HAM_DOCS=	README INSTALL ChangeLog TODO AUTHORS CREDITS
+
+post-extract:
+	${REINPLACE_CMD} -e 's#-ldl##g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's#-ldl##g' ${WRKSRC}/unittests/Makefile.in
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/documentation/Doxyfile ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/documentation/tutorial.odt ${DOCSDIR}
+.for i in ${HAM_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/hamsterdb/distinfo b/databases/hamsterdb/distinfo
index 1d40cbf5493a..886d82d2023b 100644
--- a/databases/hamsterdb/distinfo
+++ b/databases/hamsterdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (hamsterdb-1.0.9.tar.gz) = 4e04c152b343fabae816c2bbf99c522b
-SHA256 (hamsterdb-1.0.9.tar.gz) = 2b8400a5dcc098cac8b62e7c6ec150600431e647d041f83a2e8fc3377c015d40
-SIZE (hamsterdb-1.0.9.tar.gz) = 922237
+MD5 (hamsterdb-1.1.0.tar.gz) = 4117a0972e82502ba6c59edd0aae5b0c
+SHA256 (hamsterdb-1.1.0.tar.gz) = 15347f834154c02b47b8ffaade2b350483edfc3fbdb67ab0070a40c9c37f7ba4
+SIZE (hamsterdb-1.1.0.tar.gz) = 1023982
diff --git a/databases/hamsterdb/files/patch-bfc-testsuite.cpp b/databases/hamsterdb/files/patch-bfc-testsuite.cpp
new file mode 100644
index 000000000000..707b49777131
--- /dev/null
+++ b/databases/hamsterdb/files/patch-bfc-testsuite.cpp
@@ -0,0 +1,11 @@
+--- unittests/bfc-testsuite.cpp.orig	2009-12-13 11:26:20.000000000 +0800
++++ unittests/bfc-testsuite.cpp	2009-12-13 11:27:02.000000000 +0800
+@@ -11,6 +11,8 @@
+ 
+ /* #include "../src/config.h"    - not an integral part of hamster but rather the, ah, 'platform independent' BFC */
+ 
++#define __USE_BSD 1
++
+ #include <stdexcept>
+ 
+ #include "bfc-testsuite.hpp"
diff --git a/databases/hamsterdb/pkg-plist b/databases/hamsterdb/pkg-plist
index bd29c47074c2..1aaa3d500b56 100644
--- a/databases/hamsterdb/pkg-plist
+++ b/databases/hamsterdb/pkg-plist
@@ -4,11 +4,16 @@ lib/libhamsterdb.so
 lib/libhamsterdb.so.1
 include/ham/hamsterdb.h
 include/ham/hamsterdb_int.h
+include/ham/hamsterdb_stats.h
 include/ham/types.h
 include/ham/hamsterdb.hpp
 bin/ham_info
 bin/ham_dump
 @dirrm include/ham
-%%PORTDOCS%%%%DOCSDIR%%/Doxyfile
-%%PORTDOCS%%%%DOCSDIR%%/tutorial.odt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%