diff --git a/x11/gnome/oaf/Makefile b/x11/gnome/oaf/Makefile
index 91c382ee364..880850507d1 100644
--- a/x11/gnome/oaf/Makefile
+++ b/x11/gnome/oaf/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.10 2002/05/15 18:05:18 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2002/05/29 14:32:55 nino Exp $
 
 COMMENT=		"Object Activation Framework for GNOME"
 
-DISTNAME=		oaf-0.6.8
-CATEGORIES=		devel
-NEED_VERSION=   	1.504
+DISTNAME=		oaf-0.6.10
+CATEGORIES=		devel x11/gnome
+NEED_VERSION=   	1.530
 HOMEPAGE=		http://www.gnome.org/
 
-MAINTAINER=		Nils Nordman <nino@nforced.com>
+MAINTAINER=		Nils Nordman <nino@openbsd.org>
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/oaf/}
 EXTRACT_SUFX=           .tar.bz2
diff --git a/x11/gnome/oaf/distinfo b/x11/gnome/oaf/distinfo
index 269fbdbaf52..216bcc7a254 100644
--- a/x11/gnome/oaf/distinfo
+++ b/x11/gnome/oaf/distinfo
@@ -1,3 +1,3 @@
-MD5 (oaf-0.6.8.tar.bz2) = 4bcd87fe07629c675fffff7a6873b981
-RMD160 (oaf-0.6.8.tar.bz2) = 9d612b7e4019b19e267ba8cf449f2fe06879f2ec
-SHA1 (oaf-0.6.8.tar.bz2) = 9f55d756484d6c667c525e02bf195817af677b0c
+MD5 (oaf-0.6.10.tar.bz2) = ed9aa2ceb70bba34034b3134b22d2729
+RMD160 (oaf-0.6.10.tar.bz2) = 5b894ee82bb54bc44785d4335a65774174e139e3
+SHA1 (oaf-0.6.10.tar.bz2) = d8eaff6b3bc953fc4158f55b03ba92cb197518c5
diff --git a/x11/gnome/oaf/patches/patch-oafd_qsort_ex_c b/x11/gnome/oaf/patches/patch-oafd_qsort_ex_c
deleted file mode 100644
index 9716532898f..00000000000
--- a/x11/gnome/oaf/patches/patch-oafd_qsort_ex_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-oafd_qsort_ex_c,v 1.1 2002/02/15 19:20:07 nino Exp $
---- oafd/qsort_ex.c.orig	Tue Feb  5 22:21:56 2002
-+++ oafd/qsort_ex.c	Tue Feb  5 22:22:09 2002
-@@ -26,7 +26,7 @@
- #include <string.h>
- #include "qsort_ex.h"
- 
--#if HAVE_ALLOCA
-+#if HAVE_ALLOCA_H
- #include <alloca.h>
- #endif
- 
diff --git a/x11/gnome/oaf/pkg/PLIST b/x11/gnome/oaf/pkg/PLIST
index b91a20200cf..b5462ae57c8 100644
--- a/x11/gnome/oaf/pkg/PLIST
+++ b/x11/gnome/oaf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/03/26 18:39:12 nino Exp $
+@comment $OpenBSD: PLIST,v 1.6 2002/05/29 14:32:55 nino Exp $
 bin/oaf-client
 bin/oaf-config
 bin/oaf-empty-server
@@ -24,6 +24,7 @@ lib/oafConf.sh
 man/man1/oafd.1
 share/aclocal/oaf.m4
 share/examples/oaf/oaf/oaf-config.xml
+@comment share/examples/oaf/oaf/oaf-config.xml.sample
 share/idl/oaf-factory.idl
 share/idl/oaf.idl
 share/locale/az/LC_MESSAGES/oaf.mo
@@ -61,6 +62,70 @@ share/oaf/OAF_naming-service.oaf
 share/oaf/empty.oafinfo
 %%SHARED%%
 @dirrm share/oaf
+@comment @dirrm share/locale/zh_TW/LC_MESSAGES
+@comment @dirrm share/locale/zh_TW
+@comment @dirrm share/locale/zh_CN/LC_MESSAGES
+@comment @dirrm share/locale/zh_CN
+@comment @dirrm share/locale/uk/LC_MESSAGES
+@comment @dirrm share/locale/uk
+@comment @dirrm share/locale/tr/LC_MESSAGES
+@comment @dirrm share/locale/tr
+@comment @dirrm share/locale/ta/LC_MESSAGES
+@comment @dirrm share/locale/ta
+@comment @dirrm share/locale/sv/LC_MESSAGES
+@comment @dirrm share/locale/sv
+@comment @dirrm share/locale/sl/LC_MESSAGES
+@comment @dirrm share/locale/sl
+@comment @dirrm share/locale/sk/LC_MESSAGES
+@comment @dirrm share/locale/sk
+@comment @dirrm share/locale/ru/LC_MESSAGES
+@comment @dirrm share/locale/ru
+@comment @dirrm share/locale/ro/LC_MESSAGES
+@comment @dirrm share/locale/ro
+@comment @dirrm share/locale/pt_BR/LC_MESSAGES
+@comment @dirrm share/locale/pt_BR
+@comment @dirrm share/locale/pt/LC_MESSAGES
+@comment @dirrm share/locale/pt
+@comment @dirrm share/locale/pl/LC_MESSAGES
+@comment @dirrm share/locale/pl
+@comment @dirrm share/locale/no/LC_MESSAGES
+@comment @dirrm share/locale/no
+@comment @dirrm share/locale/nn/LC_MESSAGES
+@comment @dirrm share/locale/nn
+@comment @dirrm share/locale/nl/LC_MESSAGES
+@comment @dirrm share/locale/nl
+@comment @dirrm share/locale/ko/LC_MESSAGES
+@comment @dirrm share/locale/ko
+@comment @dirrm share/locale/ja/LC_MESSAGES
+@comment @dirrm share/locale/ja
+@comment @dirrm share/locale/it/LC_MESSAGES
+@comment @dirrm share/locale/it
+@comment @dirrm share/locale/hu/LC_MESSAGES
+@comment @dirrm share/locale/hu
+@comment @dirrm share/locale/gl/LC_MESSAGES
+@comment @dirrm share/locale/gl
+@comment @dirrm share/locale/ga/LC_MESSAGES
+@comment @dirrm share/locale/ga
+@comment @dirrm share/locale/fr/LC_MESSAGES
+@comment @dirrm share/locale/fr
+@comment @dirrm share/locale/fi/LC_MESSAGES
+@comment @dirrm share/locale/fi
+@comment @dirrm share/locale/eu/LC_MESSAGES
+@comment @dirrm share/locale/eu
+@comment @dirrm share/locale/es/LC_MESSAGES
+@comment @dirrm share/locale/es
+@comment @dirrm share/locale/el/LC_MESSAGES
+@comment @dirrm share/locale/el
+@comment @dirrm share/locale/de/LC_MESSAGES
+@comment @dirrm share/locale/de
+@comment @dirrm share/locale/da/LC_MESSAGES
+@comment @dirrm share/locale/da
+@comment @dirrm share/locale/bg/LC_MESSAGES
+@comment @dirrm share/locale/bg
+@comment @dirrm share/locale/az/LC_MESSAGES
+@comment @dirrm share/locale/az
+@comment @dirrm share/locale
 @dirrm share/examples/oaf/oaf
 @dirrm share/examples/oaf
+@comment @dirrm share/aclocal
 @dirrm include/liboaf