diff --git a/devel/libzvt/Makefile b/devel/libzvt/Makefile
index a3e7b32c454..edd63b601b8 100644
--- a/devel/libzvt/Makefile
+++ b/devel/libzvt/Makefile
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2005/11/14 09:58:31 wilfried Exp $
+# $OpenBSD: Makefile,v 1.6 2006/01/07 15:10:53 bernd Exp $
 
 COMMENT=		"library for handling pseudo terminals"
 
 DISTNAME=		libzvt-2.0.1
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
+SHARED_LIBS=		zvt-2.0 0.1
+
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gnome.org/
@@ -25,6 +27,7 @@ BUILD_DEPENDS=		:pkgconfig->=0.12.0p1:devel/pkgconfig
 LIB_DEPENDS=		gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
 			art_lgpl_2.5::graphics/libart
 
+USE_LIBTOOL=		Yes
 SEPARATE_BUILD= 	concurrent
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
diff --git a/devel/libzvt/pkg/PFRAG.shared b/devel/libzvt/pkg/PFRAG.shared
index 24884619c48..7c71ba5323f 100644
--- a/devel/libzvt/pkg/PFRAG.shared
+++ b/devel/libzvt/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/14 23:43:56 espie Exp $
-@lib lib/libzvt-2.0.so.0.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/07 15:10:53 bernd Exp $
+@lib lib/libzvt-2.0.so.${LIBzvt-2.0_VERSION}
diff --git a/devel/luacompat/Makefile b/devel/luacompat/Makefile
index 7a21e2d7421..925580faceb 100644
--- a/devel/luacompat/Makefile
+++ b/devel/luacompat/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2005/09/06 13:09:27 pedro Exp $
+# $OpenBSD: Makefile,v 1.4 2006/01/07 15:10:53 bernd Exp $
 
 COMMENT=	"compatibility module for lua 5.1"
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 DISTNAME=	compat-5.1r4
 PKGNAME=	luacompat-5.1r4
+SHARED_LIBS=	luacompat 5.1
 DIST_SUBDIR=	luacompat-5.1r4
 CATEGORIES=	devel
 
@@ -29,13 +30,15 @@ post-extract:
 
 do-build:
 	cd ${WRKSRC};\
-	${CC} -o libluacompat.so.5.1 -I${LOCALBASE}/include -shared -fPIC compat-5.1.c
+	${CC} -o libluacompat.so.${LIBluacompat_VERSION} \
+		-I${LOCALBASE}/include -shared -fPIC compat-5.1.c
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lua/luacompat
 	${INSTALL_DATA} ${WRKSRC}/init.lua ${PREFIX}/lua/luacompat
 	${INSTALL_DATA} ${WRKSRC}/compat-5.1.lua ${PREFIX}/lua/luacompat
 	${INSTALL_DATA} ${WRKSRC}/compat-5.1.h ${PREFIX}/include/luacompat.h
-	${INSTALL_DATA} ${WRKSRC}/libluacompat.so.5.1 ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libluacompat.so.${LIBluacompat_VERSION} \
+		${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/luacompat/pkg/PFRAG.shared b/devel/luacompat/pkg/PFRAG.shared
index 594a9d7b15f..a0f2b482f50 100644
--- a/devel/luacompat/pkg/PFRAG.shared
+++ b/devel/luacompat/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/04/19 14:48:09 pedro Exp $
-@lib lib/libluacompat.so.5.1
+@comment $OpenBSD: PFRAG.shared,v 1.2 2006/01/07 15:10:53 bernd Exp $
+@lib lib/libluacompat.so.${LIBluacompat_VERSION}