diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 01a5c937369..bb937b9dad7 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -1,10 +1,14 @@
-# $OpenBSD: Makefile,v 1.10 2005/05/11 02:08:12 kevlo Exp $
+# $OpenBSD: Makefile,v 1.11 2005/12/24 13:40:32 espie Exp $
 
 COMMENT=	"library for Chinese language processing"
 
 DISTNAME=	libtabe-0.2.6
-PKGNAME=	zh-${DISTNAME}
+PKGNAME=	zh-${DISTNAME}p0
 CATEGORIES=	chinese
+SHARED_LIBS=	bims 2.1 \
+		tabe 2.1
+MODGNU_SHARED_LIBS=	bims '' \
+			tabe ''
 
 HOMEPAGE=	http://libtabe.sourceforge.net/
 
@@ -20,6 +24,7 @@ MASTER_SITES=	http://www.kpvs.tp.edu.tw/
 
 LIB_DEPENDS=	lib/db/db.=3:db-3.*:databases/db/v3
 
+USE_LIBTOOL=	Yes
 USE_X11=	Yes
 CONFIGURE_STYLE= gnu dest
 CONFIGURE_ARGS=	--with-db-inc=${LOCALBASE}/include/db \
diff --git a/chinese/libtabe/patches/patch-src_Makefile_in b/chinese/libtabe/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..4fabaf8562c
--- /dev/null
+++ b/chinese/libtabe/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.3 2005/12/24 13:40:32 espie Exp $
+--- src/Makefile.in.orig	Sat Dec 24 14:31:58 2005
++++ src/Makefile.in	Sat Dec 24 14:32:11 2005
+@@ -55,7 +55,7 @@ all: $(LIBNAME) bims
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		$(libtabe_la_LDFLAGS)
+ 
+ bims:
+ 	(cd supports/bims; $(MAKE))
diff --git a/chinese/libtabe/patches/patch-src_supports_bims_Makefile_in b/chinese/libtabe/patches/patch-src_supports_bims_Makefile_in
new file mode 100644
index 00000000000..c1100e2e485
--- /dev/null
+++ b/chinese/libtabe/patches/patch-src_supports_bims_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_supports_bims_Makefile_in,v 1.3 2005/12/24 13:40:32 espie Exp $
+--- src/supports/bims/Makefile.in.orig	Sat Dec 24 14:31:08 2005
++++ src/supports/bims/Makefile.in	Sat Dec 24 14:31:47 2005
+@@ -45,7 +45,7 @@ all: $(LIBNAME)
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		$(libbims_la_LDFLAGS)
+ 
+ bims.lo: bims.c bims.h
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
diff --git a/chinese/libtabe/pkg/PFRAG.shared b/chinese/libtabe/pkg/PFRAG.shared
index b84919e1cce..7b7f517d6bd 100644
--- a/chinese/libtabe/pkg/PFRAG.shared
+++ b/chinese/libtabe/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/08 16:15:17 espie Exp $
-@lib lib/libbims.so.2.1
-@lib lib/libtabe.so.2.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/24 13:40:32 espie Exp $
+@lib lib/libbims.so.${LIBbims_VERSION}
+@lib lib/libtabe.so.${LIBtabe_VERSION}