diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
index 03ecf7121c6..5b33fd7a3e3 100644
--- a/editors/openoffice3/Makefile
+++ b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2009/11/28 18:33:57 kili Exp $
+# $OpenBSD: Makefile,v 1.31 2009/12/21 16:13:02 robert Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -10,7 +10,7 @@ VERSION=	3.1.1
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOO310_m19
 PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}p1
+PKGNAME-main=	openoffice-${VERSION}p2
 PKGNAME-kde=	openoffice-kde-${VERSION}
 PKGNAME-java=	openoffice-java-${VERSION}p0
 CATEGORIES=	editors productivity
diff --git a/editors/openoffice3/pkg/MESSAGE-main b/editors/openoffice3/pkg/MESSAGE-main
index de1b4d6d860..ce60ee14a1e 100644
--- a/editors/openoffice3/pkg/MESSAGE-main
+++ b/editors/openoffice3/pkg/MESSAGE-main
@@ -1,7 +1,9 @@
+
 To start OpenOffice run '/usr/local/bin/soffice'
 
 Platform dependent extensions have been installed in
-  ${PREFIX}/openoffice.org3/share/extension/install/
+${PREFIX}/openoffice.org3/share/extension/install/
 
 To install or uninstall the extensions, you can either
-use the Extensions Manager or unopkg.
+use the Extensions Manager or
+${PREFIX}/openoffice.org3/program/unopkg.
diff --git a/editors/openoffice3/pkg/PLIST-main b/editors/openoffice3/pkg/PLIST-main
index 9785527caa1..b44f99c7ddf 100644
--- a/editors/openoffice3/pkg/PLIST-main
+++ b/editors/openoffice3/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2009/07/01 13:05:54 naddy Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2009/12/21 16:13:02 robert Exp $
 @pkgpath editors/openoffice
 %%SHARED%%
 bin/sbase
@@ -5910,3 +5910,5 @@ share/icons/hicolor/48x48/apps/ooo-writer.png
 @unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
 @exec %D/bin/update-desktop-database
 @unexec %D/bin/update-desktop-database
+@exec %D/openoffice.org3/program/unopkg add --shared %D/openoffice.org3/share/extension/install/dict-en.oxt > /dev/null 2>&1
+@unexec %D/openoffice.org3/program/unopkg remove --shared org.openoffice.en.hunspell.dictionaries > /dev/null 2>&1