diff --git a/www/opera/Makefile b/www/opera/Makefile
index cb437f23467..6b51f51b6d1 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2002/04/23 15:44:43 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2002/05/16 12:55:21 naddy Exp $
 
 ONLY_FOR_ARCHS=	i386
 
 COMMENT=	"fast and customizable WWW browser"
 
-PKGNAME=	opera-6.0b2
-DISTNAME=	opera-6.0-20020412.1-static-qt.i386
+PKGNAME=	opera-6.0
+DISTNAME=	opera-6.0-20020510.1-static-qt.i386
 CATEGORIES=	www
 NEED_VERSION=	1.522
 HOMEPAGE=	http://www.opera.com/
@@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP=	"Commercial software"
 PERMIT_DISTFILES_CDROM=	"Commercial software"
 PERMIT_DISTFILES_FTP=	"Commercial software"
 
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/600/beta2/ \
-		http://opera.online.no/linux/600/beta2/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/600/final/en/qt_static/ \
+		http://opera.online.no/linux/600/final/en/qt_static/
 EXTRACT_SUFX=	.tar.bz2
 
 RUN_DEPENDS=	:redhat_base->=6.2p1:emulators/redhat/base \
@@ -30,7 +30,8 @@ NO_REGRESS=	Yes
 do-install:
 	cd ${WRKBUILD} && ./install.sh \
 	    --prefix=${PREFIX} \
-	    --exec_prefix=${PREFIX}/libexec
+	    --exec_prefix=${PREFIX}/libexec \
+	    --plugindir=${PREFIX}/lib/opera/plugins
 	cd ${PREFIX}/share/doc/opera; \
 	    ln -sf ../../opera/help .
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opera
diff --git a/www/opera/distinfo b/www/opera/distinfo
index 23f63e5cbfb..e4a5efb96d9 100644
--- a/www/opera/distinfo
+++ b/www/opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-6.0-20020412.1-static-qt.i386.tar.bz2) = b12a5c0e55559e0dbd8781de5f1789d1
-RMD160 (opera-6.0-20020412.1-static-qt.i386.tar.bz2) = 16856a42fb209d02866099617ecdf471bdd6b6a1
-SHA1 (opera-6.0-20020412.1-static-qt.i386.tar.bz2) = d74ec57469610aa21167e3ad3e993201861cb430
+MD5 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = 8d7a88ea7be88032594e12ca85f744b8
+RMD160 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = d16a81830b734edcd92719a0cded08df70e01e5c
+SHA1 (opera-6.0-20020510.1-static-qt.i386.tar.bz2) = f590307339d66588634ccb2874323f3319b0fe97
diff --git a/www/opera/patches/patch-install_sh b/www/opera/patches/patch-install_sh
index 771de817632..046563b028d 100644
--- a/www/opera/patches/patch-install_sh
+++ b/www/opera/patches/patch-install_sh
@@ -1,27 +1,7 @@
-$OpenBSD: patch-install_sh,v 1.3 2002/04/23 15:44:43 naddy Exp $
---- install.sh.orig	Fri Apr 12 14:01:42 2002
-+++ install.sh	Fri Apr 19 00:13:41 2002
-@@ -347,6 +347,9 @@ set_os_spesific()
- 		fi
- 	;;
- 
-+	i386:OpenBSD)
-+	;;
-+
- 	i[3456]86:Linux|mips:Linux)
- 		cpf='-f'
- 		if test "$verbose" -gt "1"; then
-@@ -731,6 +734,9 @@ generate_wrapper()
- 	    wrapper_plugin_paths=''
- 	;;
- 
-+	i386:OpenBSD)
-+	;;
-+
- 	*:*)
- 		error 'os'
- 	;;
-@@ -906,10 +912,10 @@ run_install()
+$OpenBSD: patch-install_sh,v 1.4 2002/05/16 12:55:21 naddy Exp $
+--- install.sh.orig	Fri May 10 15:36:21 2002
++++ install.sh	Thu May 16 00:25:05 2002
+@@ -922,10 +922,10 @@ run_install()
  	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so.$plugin_version_major
  	ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so