diff --git a/databases/hamsterdb/Makefile b/databases/hamsterdb/Makefile
index d34787604461..5785505e554e 100644
--- a/databases/hamsterdb/Makefile
+++ b/databases/hamsterdb/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	databases
 MASTER_SITES=	http://hamsterdb.com/public/dl/
 
 MAINTAINER=	wen@FreeBSD.org
-COMMENT=	A Lightweight Embedded Database Engine
+COMMENT=	Lightweight Embedded Database Engine
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -15,16 +15,17 @@ USE_LDCONFIG=	yes
 
 HAM_DOCS=	README INSTALL ChangeLog TODO AUTHORS CREDITS
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 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}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${HAM_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/databases/hamsterdb/pkg-descr b/databases/hamsterdb/pkg-descr
index c5b4d609ad11..6a7c95387ec9 100644
--- a/databases/hamsterdb/pkg-descr
+++ b/databases/hamsterdb/pkg-descr
@@ -14,4 +14,4 @@ ANSI-C, hamsterdb runs on many architectures: Intel-compatible
 systems include Microsoft Windows, Microsoft Windows CE, Linux,
 SunOS and other Unices.
 
-WWW:    http://hamsterdb.com/index
+WWW: http://hamsterdb.com/index