diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 9297ad95af40..0b80ab6b9785 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	tokyocabinet
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.7
 CATEGORIES=	databases
-MASTER_SITES=	SF
+MASTER_SITES=	http://tokyocabinet.sourceforge.net/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A modern implementation of DBM
@@ -25,8 +25,7 @@ MAN3=		tcadb.3 tcbdb.3 tchdb.3 tcutil.3 tokyocabinet.3
 DOCS=		COPYING ChangeLog README THANKS
 BINS=		tcamgr tcatest tcbmgr tcbmttest tcbtest tchmgr tchmttest \
 		tchtest tcucodec tcumttest tcutest
-LIBS=		libtokyocabinet.a libtokyocabinet.so libtokyocabinet.so.3 \
-		libtokyocabinet.so.3.1.0
+LIBS=		libtokyocabinet.a
 INCLUDES=	tcbdb.h tchdb.h tcutil.h
 
 OPTIONS=	DEBUG "Debugging support" off \
@@ -37,8 +36,7 @@ OPTIONS=	DEBUG "Debugging support" off \
 		SWAB "Swapping byte-orders build" off \
 		UYIELD "Detecting race conditions" off \
 		ZLIB "Disable ZLIB compression" off \
-		PTHREAD "Disable POSIX thread support" off \
-		SHARED "Avoid to build shared libraries" off
+		PTHREAD "Disable POSIX thread support" off
 
 .include <bsd.port.pre.mk>
 
@@ -86,8 +84,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${EXAMPLESDIR}/)
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${DOCSDIR}/)
 .endif
 .for i in ${LIBS}
 	@${CP} ${WRKSRC}/${i} ${PREFIX}/lib/
diff --git a/databases/tokyocabinet/distinfo b/databases/tokyocabinet/distinfo
index f99bebc817e7..d335f1cf562f 100644
--- a/databases/tokyocabinet/distinfo
+++ b/databases/tokyocabinet/distinfo
@@ -1,3 +1,3 @@
-MD5 (tokyocabinet-1.2.0.tar.gz) = fe40e173901a0c63a100245c753d55b9
-SHA256 (tokyocabinet-1.2.0.tar.gz) = f5d7e7a3382dfe7e0b6f91aaf8060c4318573030e6960d2f718714c69b7f3839
-SIZE (tokyocabinet-1.2.0.tar.gz) = 353355
+MD5 (tokyocabinet-1.2.7.tar.gz) = c6341743308b11e41aff577c8937162b
+SHA256 (tokyocabinet-1.2.7.tar.gz) = e6ab9105d3176f2db1e1fceb2769059fb99176413214fdb64307b52dd95e7e1f
+SIZE (tokyocabinet-1.2.7.tar.gz) = 362380
diff --git a/databases/tokyocabinet/pkg-plist b/databases/tokyocabinet/pkg-plist
index c1abfa29ce55..2ebca6ec9600 100644
--- a/databases/tokyocabinet/pkg-plist
+++ b/databases/tokyocabinet/pkg-plist
@@ -14,23 +14,19 @@ include/tcbdb.h
 include/tchdb.h
 include/tcutil.h
 lib/libtokyocabinet.a
-lib/libtokyocabinet.so
-lib/libtokyocabinet.so.3
-lib/libtokyocabinet.so.3.1.0
 libdata/pkgconfig/tokyocabinet.pc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/benchmark.pdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/common.css
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/icon16.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/index.ja.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/logo-ja.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/logo.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/spex-en.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/doc/spex-ja.html
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/doc
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/doc/benchmark.pdf
+%%PORTDOCS%%%%DOCSDIR%%/doc/common.css
+%%PORTDOCS%%%%DOCSDIR%%/doc/icon16.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/logo-ja.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/doc/spex-en.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/spex-ja.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%