diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 296421ff778..160ed21a9a9 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2005/05/11 19:08:53 alek Exp $
+# $OpenBSD: Makefile,v 1.24 2005/12/30 22:21:21 steven Exp $
 
 COMMENT=	"Motif toolkit"
 COMMENT-debuglibs="Motif toolkit debug libraries"
@@ -6,9 +6,13 @@ COMMENT-demos=	"Motif toolkit demos"
 VERSION=	2.1.30
 DISTNAME=	motif
 PATCHLEVEL=	5
-PKGNAME=	openmotif-${VERSION}.${PATCHLEVEL}p0
-PKGNAME-demos=	openmotif-demos-${VERSION}.${PATCHLEVEL}
-PKGNAME-debuglibs=openmotif-debuglibs-${VERSION}.${PATCHLEVEL}
+PKGNAME=	openmotif-${VERSION}.${PATCHLEVEL}p1
+PKGNAME-demos=	openmotif-demos-${VERSION}.${PATCHLEVEL}p0
+PKGNAME-debuglibs=openmotif-debuglibs-${VERSION}.${PATCHLEVEL}p0
+
+SHARED_LIBS=	Mrm	3.0	\
+		Uil	3.0	\
+		Xm	3.0
 
 CATEGORIES=	x11
 
@@ -28,8 +32,6 @@ PATCH_DIST_STRIP=	-p1
 
 HOMEPAGE=	http://www.opengroup.org/openmotif/
 
-MAINTAINER=	Sungman Cho <smcho@tsp.korea.ac.kr>
-
 # license only available on webpage
 # http://www.opengroup.org/openmotif/license
 PERMIT_PACKAGE_CDROM=	Yes
@@ -45,6 +47,11 @@ USE_X11=	Yes
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 
+MAKE_FLAGS=	SOMRMREV=${LIBMrm_VERSION}	\
+		SOUILREV=${LIBUil_VERSION}	\
+		SOXMREV=${LIBXm_VERSION}
+FAKE_FLAGS=	${MAKE_FLAGS} ${DESTDIRNAME}=${WRKINST}
+
 # This dialog has been copied from the lesstif port.
 .if defined(HAVE_MOTIF) && ${HAVE_MOTIF:L} == "yes"
 IS_INTERACTIVE=	Yes
diff --git a/x11/openmotif/pkg/PFRAG.shared b/x11/openmotif/pkg/PFRAG.shared
index 4d47bb09564..0755514f6d1 100644
--- a/x11/openmotif/pkg/PFRAG.shared
+++ b/x11/openmotif/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2005/05/11 19:08:53 alek Exp $
-@lib lib/libMrm.so.3.0
-@lib lib/libUil.so.3.0
-@lib lib/libXm.so.3.0
+@comment $OpenBSD: PFRAG.shared,v 1.6 2005/12/30 22:21:21 steven Exp $
+@lib lib/libMrm.so.${LIBMrm_VERSION}
+@lib lib/libUil.so.${LIBUil_VERSION}
+@lib lib/libXm.so.${LIBXm_VERSION}