diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index a3f094c379f6..073aa75e47e4 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2009/02/19 06:31:55 obache Exp $
+# $NetBSD: Makefile,v 1.14 2009/03/21 05:36:53 obache Exp $
 #
 
-DISTNAME=	tokyotyrant-1.1.16
+DISTNAME=	tokyotyrant-1.1.17
 CATEGORIES=	databases net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tokyocabinet/}
 
@@ -20,7 +20,7 @@ TEST_TARGET=	check
 
 .include "options.mk"
 
-BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.7
+BUILDLINK_API_DEPENDS.tokyocabinet+=	tokyocabinet>=1.4.10
 .include "../../databases/tokyocabinet/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 PTHREAD_AUTO_VARS=	yes
diff --git a/databases/tokyotyrant/PLIST b/databases/tokyotyrant/PLIST
index ee2d0ec46668..c4f510c36413 100644
--- a/databases/tokyotyrant/PLIST
+++ b/databases/tokyotyrant/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/02/19 06:31:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/03/21 05:36:53 obache Exp $
 bin/tcrmgr
 bin/tcrmttest
 bin/tcrtest
@@ -10,8 +10,8 @@ include/tculog.h
 include/ttutil.h
 lib/libtokyotyrant.a
 lib/libtokyotyrant.so
-lib/libtokyotyrant.so.2
-lib/libtokyotyrant.so.2.7.0
+lib/libtokyotyrant.so.3
+lib/libtokyotyrant.so.3.1.0
 lib/pkgconfig/tokyotyrant.pc
 man/man1/tcrmgr.1
 man/man1/tcrmttest.1
diff --git a/databases/tokyotyrant/distinfo b/databases/tokyotyrant/distinfo
index 6f8f34705cd9..34e40e1ba4af 100644
--- a/databases/tokyotyrant/distinfo
+++ b/databases/tokyotyrant/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2009/02/19 06:31:55 obache Exp $
+$NetBSD: distinfo,v 1.12 2009/03/21 05:36:53 obache Exp $
 
-SHA1 (tokyotyrant-1.1.16.tar.gz) = f344576d62e190b2c33028d94c41139dd3844ec6
-RMD160 (tokyotyrant-1.1.16.tar.gz) = 1ec5015b5b4499bb3660807ca71862bca19779cc
-Size (tokyotyrant-1.1.16.tar.gz) = 164416 bytes
+SHA1 (tokyotyrant-1.1.17.tar.gz) = 496603773d39e837e9403032a78300024795aa82
+RMD160 (tokyotyrant-1.1.17.tar.gz) = c6af9729a407ec5bce6c8c3929e385f2cac1cdbd
+Size (tokyotyrant-1.1.17.tar.gz) = 180401 bytes
 SHA1 (patch-aa) = d1c6aa7e3197b33a1988320ca5ad865ae3fa23c4
-SHA1 (patch-ab) = 740213a95f7bdacced101b1a85f8f5d17188d11c
+SHA1 (patch-ab) = ccacfe7b3593ce4bfd995813189d1dd655a98095
 SHA1 (patch-ac) = e83f1c1f8de4e371be4fa06d91242258f313bda4
diff --git a/databases/tokyotyrant/patches/patch-ab b/databases/tokyotyrant/patches/patch-ab
index 1e450cb054cc..10d098dc46b9 100644
--- a/databases/tokyotyrant/patches/patch-ab
+++ b/databases/tokyotyrant/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.5 2009/02/19 06:31:55 obache Exp $
+$NetBSD: patch-ab,v 1.6 2009/03/21 05:36:53 obache Exp $
 
 Avoid to break pkgsrc's tools.
 
---- configure.orig	2009-02-17 09:48:58.000000000 +0000
+--- configure.orig	2009-03-10 02:09:03.000000000 +0000
 +++ configure
-@@ -1746,13 +1746,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+@@ -1746,12 +1746,9 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
  MYPOSTCMD="true"
  
  # Building paths
--pathtmp="$PATH"
--PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
--PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
  CPATH="$HOME/include:/usr/local/include:$CPATH"
  LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
  LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
@@ -18,7 +17,7 @@ Avoid to break pkgsrc's tools.
  export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
  if type pkg-config > /dev/null 2>&1
  then
-@@ -4428,7 +4424,7 @@ _ACEOF
+@@ -4433,7 +4430,7 @@ _ACEOF
  
  fi
  
@@ -27,7 +26,7 @@ Avoid to break pkgsrc's tools.
  then
  
  { echo "$as_me:$LINENO: checking for main in -llua" >&5
-@@ -5295,7 +5291,7 @@ echo "$as_me: error: tcutil.h is require
+@@ -5300,7 +5297,7 @@ echo "$as_me: error: tcutil.h is require
  fi