diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index e240a3526c5..62f46036915 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2005/10/30 00:10:40 fgsch Exp $
+# $OpenBSD: Makefile,v 1.27 2006/01/07 17:58:49 bernd Exp $
 
 # XXX This will panic any vax
 NOT_FOR_ARCHS=	vax
@@ -6,6 +6,9 @@ NOT_FOR_ARCHS=	vax
 COMMENT=	"shared memory lib for apps with pre-forked process model"
 
 DISTNAME=	mm-1.3.1
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	mm 13.21
+
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.ossp.org/pkg/lib/mm/
 
@@ -17,6 +20,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+USE_LIBTOOL=	 Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static
diff --git a/devel/mm/pkg/PFRAG.shared b/devel/mm/pkg/PFRAG.shared
index c0adcb57402..38efe00c8b7 100644
--- a/devel/mm/pkg/PFRAG.shared
+++ b/devel/mm/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2004/10/30 04:34:09 brad Exp $
-@lib lib/libmm.so.13.21
+@comment $OpenBSD: PFRAG.shared,v 1.6 2006/01/07 17:58:49 bernd Exp $
+@lib lib/libmm.so.${LIBmm_VERSION}
diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile
index e21c0749a32..5540e813971 100644
--- a/devel/mysql++/Makefile
+++ b/devel/mysql++/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2005/10/07 13:21:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.20 2006/01/07 17:58:49 bernd Exp $
 
 NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}
 
@@ -7,8 +7,9 @@ COMMENT-docs=		"C++ API for MySQL documentation"
 
 VERSION=		2.0.6
 DISTNAME=		mysql++-${VERSION}
-PKGNAME=		${DISTNAME}
+PKGNAME=		${DISTNAME}p0
 PKGNAME-docs=		mysql++-docs-${VERSION}
+SHARED_LIBS=		mysqlpp 2.6
 CATEGORIES=		devel
 
 HOMEPAGE=		http://tangentsoft.net/mysql++/
@@ -35,6 +36,7 @@ PKG_ARCH=		*
 .endif
 
 NO_REGRESS=		Yes
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 
 post-install:
diff --git a/devel/mysql++/pkg/PFRAG.shared b/devel/mysql++/pkg/PFRAG.shared
index 3eed2af3a7c..7bb5f6e1c60 100644
--- a/devel/mysql++/pkg/PFRAG.shared
+++ b/devel/mysql++/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2005/10/07 13:24:53 wilfried Exp $
-@lib lib/libmysqlpp.so.2.6
+@comment $OpenBSD: PFRAG.shared,v 1.4 2006/01/07 17:58:49 bernd Exp $
+@lib lib/libmysqlpp.so.${LIBmysqlpp_VERSION}
diff --git a/devel/mysql++/pkg/PLIST b/devel/mysql++/pkg/PLIST
index f45719c3044..93848b8f8c0 100644
--- a/devel/mysql++/pkg/PLIST
+++ b/devel/mysql++/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2005/10/07 13:24:53 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.5 2006/01/07 17:58:49 bernd Exp $
 %%SHARED%%
 include/mysql++/
 include/mysql++/coldata.h
@@ -32,4 +32,5 @@ include/mysql++/string_util.h
 include/mysql++/tiny_int.h
 include/mysql++/type_info.h
 include/mysql++/vallist.h
+lib/libmysqlpp.a
 lib/libmysqlpp.la