diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index bdf4b50b5372..2dbcf9e4808d 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/10/18 15:12:10 mrauch Exp $
+# $NetBSD: Makefile,v 1.4 2005/10/20 14:05:39 mrauch Exp $
 
-PKGNAME=		openoffice2-bin-2.0.0rc3
+PKGNAME=		openoffice2-bin-2.0.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=contrib/rc/2.0.0rc3/}
+MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/2.0.0/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=		mrauch@NetBSD.org
@@ -51,27 +51,27 @@ DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 .    if !exists(/emul/svr4/usr/lib/ld.so)
 PKG_FAIL_REASON= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
 .    endif
-DISTNAME=	OOo_2.0.0rc3_051014_SolarisSparc_install
+DISTNAME=	OOo_2.0.0_SolarisSparc_install
 WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
 .  elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.0rc3_051015_LinuxIntel_install
+DISTNAME=	OOo_2.0.0_LinuxIntel_install
 WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-2_en-US.8968/RPMS
 .  endif
 .endif
 
 .if ${OPSYS} == "Linux"
 .if ${ARCH} == "i386"
-DISTNAME=	OOo_2.0.0rc3_051015_LinuxIntel_install
+DISTNAME=	OOo_2.0.0_LinuxIntel_install
 WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-2_en-US.8968/RPMS
 .endif
 .endif
 
 .if ${OPSYS} == "SunOS"
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-DISTNAME=	OOo_2.0.0rc3_051014_SolarisSparc_install
+DISTNAME=	OOo_2.0.0_SolarisSparc_install
 WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
 .elif ${MACHINE_ARCH} == "i386"
-DISTNAME=	OOo_2.0.0rc3_051014_Solarisx86_install
+DISTNAME=	OOo_2.0.0_Solarisx86_install
 WRKSRC=		${WRKDIR}/OOO680_m3_native_packed-1_en-US.8968/packages
 .endif
 .endif
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index 7f623d2b8425..bf1dfaaf5fc8 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2005/10/18 15:12:10 mrauch Exp $
+$NetBSD: distinfo,v 1.3 2005/10/20 14:05:39 mrauch Exp $
 
-SHA1 (OOo_2.0.0rc3_051015_LinuxIntel_install.tar.gz) = 78dfbf9ae5c69272801e8c50a35a579ba94564cc
-RMD160 (OOo_2.0.0rc3_051015_LinuxIntel_install.tar.gz) = c4caa92da88d22ebf1adc2ab11e8a7010dd2f4af
-Size (OOo_2.0.0rc3_051015_LinuxIntel_install.tar.gz) = 106447396 bytes
-SHA1 (OOo_2.0.0rc3_051014_SolarisSparc_install.tar.gz) = 712972cf04dd77cdcce77a52e7495512c662e3e8
-RMD160 (OOo_2.0.0rc3_051014_SolarisSparc_install.tar.gz) = 82dae9549a776a07ebb7d7311c8adec4643b82cd
-Size (OOo_2.0.0rc3_051014_SolarisSparc_install.tar.gz) = 109192805 bytes
-SHA1 (OOo_2.0.0rc3_051014_Solarisx86_install.tar.gz) = 393efc9ea951428827937bf0410073bbbec7ac7e
-RMD160 (OOo_2.0.0rc3_051014_Solarisx86_install.tar.gz) = 35292f81beda2d94cb74679c48ec9308651f4a12
-Size (OOo_2.0.0rc3_051014_Solarisx86_install.tar.gz) = 99784006 bytes
+SHA1 (OOo_2.0.0_LinuxIntel_install.tar.gz) = 78dfbf9ae5c69272801e8c50a35a579ba94564cc
+RMD160 (OOo_2.0.0_LinuxIntel_install.tar.gz) = c4caa92da88d22ebf1adc2ab11e8a7010dd2f4af
+Size (OOo_2.0.0_LinuxIntel_install.tar.gz) = 106447396 bytes
+SHA1 (OOo_2.0.0_SolarisSparc_install.tar.gz) = 712972cf04dd77cdcce77a52e7495512c662e3e8
+RMD160 (OOo_2.0.0_SolarisSparc_install.tar.gz) = 82dae9549a776a07ebb7d7311c8adec4643b82cd
+Size (OOo_2.0.0_SolarisSparc_install.tar.gz) = 109192805 bytes
+SHA1 (OOo_2.0.0_Solarisx86_install.tar.gz) = 393efc9ea951428827937bf0410073bbbec7ac7e
+RMD160 (OOo_2.0.0_Solarisx86_install.tar.gz) = 35292f81beda2d94cb74679c48ec9308651f4a12
+Size (OOo_2.0.0_Solarisx86_install.tar.gz) = 99784006 bytes