diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index b09df91f06b3..1b2277b07507 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		12
+MILESTONE?=		13
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080517
+SNAPDATE=		20080522
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index fa4f2eec4d8e..52af62434403 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 28735eb4580ecdebf71f277263d08962
-SHA256 (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 99739d6c6a67453ab9ada76102b9f5f353d5b51534ba697a64bd88e50a2a45d2
-SIZE (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 302485830
+MD5 (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = b3686766bff1a596fc233f9a92842e46
+SHA256 (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = e4e95ab0f73d599e58ec29db4853bd6d148dcddfde867abd4727bc429093d1b0
+SIZE (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = 301486899
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i86558 b/editors/openoffice-3-devel/files/patch-i86558
deleted file mode 100644
index ff723e835f09..000000000000
--- a/editors/openoffice-3-devel/files/patch-i86558
+++ /dev/null
@@ -1,18 +0,0 @@
---- psprint/source/printer/printerinfomanager.cxx.orig	2007-12-12 09:56:19.000000000 -0500
-+++ psprint/source/printer/printerinfomanager.cxx	2008-02-28 17:46:34.000000000 -0500
-@@ -145,12 +145,12 @@
-     bool bSuccess = false;
- 
-     // try libpaper
--    #ifdef SOLARIS
-+    #ifdef LINUX
-     // #i78617# workaround missing paperconf command; on e.g. Linux
-     // the 2>/dev/null works on the started shell also
--    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
--    #else
-     FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
-+    #else
-+    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-     #endif
-     if( pPipe )
-     {
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index b09df91f06b3..1b2277b07507 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -75,11 +75,11 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		12
+MILESTONE?=		13
 OOOTAG?=		DEV300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
-SNAPDATE=		20080517
+SNAPDATE=		20080522
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index fa4f2eec4d8e..52af62434403 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 28735eb4580ecdebf71f277263d08962
-SHA256 (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 99739d6c6a67453ab9ada76102b9f5f353d5b51534ba697a64bd88e50a2a45d2
-SIZE (openoffice.org3/OOo_DEV300_m12_source.tar.bz2) = 302485830
+MD5 (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = b3686766bff1a596fc233f9a92842e46
+SHA256 (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = e4e95ab0f73d599e58ec29db4853bd6d148dcddfde867abd4727bc429093d1b0
+SIZE (openoffice.org3/OOo_DEV300_m13_source.tar.bz2) = 301486899
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i86558 b/editors/openoffice.org-3-devel/files/patch-i86558
deleted file mode 100644
index ff723e835f09..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i86558
+++ /dev/null
@@ -1,18 +0,0 @@
---- psprint/source/printer/printerinfomanager.cxx.orig	2007-12-12 09:56:19.000000000 -0500
-+++ psprint/source/printer/printerinfomanager.cxx	2008-02-28 17:46:34.000000000 -0500
-@@ -145,12 +145,12 @@
-     bool bSuccess = false;
- 
-     // try libpaper
--    #ifdef SOLARIS
-+    #ifdef LINUX
-     // #i78617# workaround missing paperconf command; on e.g. Linux
-     // the 2>/dev/null works on the started shell also
--    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
--    #else
-     FILE* pPipe = popen( "paperconf 2>/dev/null", "r" );
-+    #else
-+    FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" );
-     #endif
-     if( pPipe )
-     {