diff --git a/x11/gnome/oaf/Makefile b/x11/gnome/oaf/Makefile
index acb9b3b0fca..835f9f1fb4c 100644
--- a/x11/gnome/oaf/Makefile
+++ b/x11/gnome/oaf/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2005/09/05 20:05:02 marcm Exp $
+# $OpenBSD: Makefile,v 1.18 2006/01/08 22:49:25 alek Exp $
 
 COMMENT=		"Object Activation Framework for GNOME"
 
 DISTNAME=		oaf-0.6.10
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
+SHARED_LIBS=		oaf 1.0
 CATEGORIES=		devel x11/gnome
 HOMEPAGE=		http://www.gnome.org/
 
@@ -23,6 +24,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c glib gmodule m wrap z
 
 USE_X11=		Yes
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
 			--disable-orbittest # XXX problems with warnings
diff --git a/x11/gnome/oaf/pkg/PFRAG.shared b/x11/gnome/oaf/pkg/PFRAG.shared
index 7585b84b4e6..53853b9f975 100644
--- a/x11/gnome/oaf/pkg/PFRAG.shared
+++ b/x11/gnome/oaf/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2004/09/15 21:48:23 espie Exp $
-@lib lib/liboaf.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2006/01/08 22:49:25 alek Exp $
+@lib lib/liboaf.so.${LIBoaf_VERSION}
diff --git a/x11/gnome/oaf/pkg/PLIST b/x11/gnome/oaf/pkg/PLIST
index ea971942759..7808ea5024e 100644
--- a/x11/gnome/oaf/pkg/PLIST
+++ b/x11/gnome/oaf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2004/10/11 04:27:24 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.10 2006/01/08 22:49:25 alek Exp $
 bin/oaf-client
 bin/oaf-config
 bin/oaf-empty-server
@@ -20,10 +20,10 @@ include/liboaf/oaf-registration.h
 include/liboaf/oaf-servreg.h
 include/liboaf/oaf-util.h
 include/liboaf/oaf.h
+lib/liboaf.a
 lib/liboaf.la
 lib/oafConf.sh
 @man man/man1/oafd.1
-share/aclocal/
 share/aclocal/oaf.m4
 share/examples/oaf/
 share/examples/oaf/oaf/
@@ -34,99 +34,42 @@ share/examples/oaf/oaf/oaf-config.xml
 share/idl/
 share/idl/oaf-factory.idl
 share/idl/oaf.idl
-share/locale/
 share/locale/az/
 share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/oaf.mo
-share/locale/bg/
-share/locale/bg/LC_MESSAGES/
 share/locale/bg/LC_MESSAGES/oaf.mo
-share/locale/da/
-share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/oaf.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/oaf.mo
-share/locale/el/
-share/locale/el/LC_MESSAGES/
 share/locale/el/LC_MESSAGES/oaf.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/oaf.mo
 share/locale/eu/
 share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/oaf.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/oaf.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/oaf.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/oaf.mo
-share/locale/gl/
-share/locale/gl/LC_MESSAGES/
 share/locale/gl/LC_MESSAGES/oaf.mo
-share/locale/hu/
-share/locale/hu/LC_MESSAGES/
 share/locale/hu/LC_MESSAGES/oaf.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/oaf.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/oaf.mo
-share/locale/ko/
-share/locale/ko/LC_MESSAGES/
 share/locale/ko/LC_MESSAGES/oaf.mo
-share/locale/nl/
-share/locale/nl/LC_MESSAGES/
 share/locale/nl/LC_MESSAGES/oaf.mo
-share/locale/nn/
-share/locale/nn/LC_MESSAGES/
 share/locale/nn/LC_MESSAGES/oaf.mo
-share/locale/no/
-share/locale/no/LC_MESSAGES/
 share/locale/no/LC_MESSAGES/oaf.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/oaf.mo
-share/locale/pt/
-share/locale/pt/LC_MESSAGES/
 share/locale/pt/LC_MESSAGES/oaf.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/oaf.mo
-share/locale/ro/
-share/locale/ro/LC_MESSAGES/
 share/locale/ro/LC_MESSAGES/oaf.mo
-share/locale/ru/
-share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/oaf.mo
-share/locale/sk/
-share/locale/sk/LC_MESSAGES/
 share/locale/sk/LC_MESSAGES/oaf.mo
-share/locale/sl/
-share/locale/sl/LC_MESSAGES/
 share/locale/sl/LC_MESSAGES/oaf.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/oaf.mo
 share/locale/ta/
 share/locale/ta/LC_MESSAGES/
 share/locale/ta/LC_MESSAGES/oaf.mo
-share/locale/tr/
-share/locale/tr/LC_MESSAGES/
 share/locale/tr/LC_MESSAGES/oaf.mo
-share/locale/uk/
-share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/oaf.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
 share/locale/zh_CN/LC_MESSAGES/oaf.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
 share/locale/zh_TW/LC_MESSAGES/oaf.mo
 share/oaf/
 share/oaf/OAF_naming-service.oaf