diff --git a/net/roxirc/Makefile b/net/roxirc/Makefile
index 56fc9e9605f..c67d16c03fb 100644
--- a/net/roxirc/Makefile
+++ b/net/roxirc/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2002/10/28 01:38:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2003/06/20 03:31:25 kevlo Exp $
 
 COMMENT=	"Tcl/Tk irc client"
 
-DISTNAME=	roxirc-1.8
+DISTNAME=	roxirc-2.0
 CATEGORIES=	net
 
 HOMEPAGE=	http://roxirc.lighter.net/
@@ -14,14 +14,15 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-MASTER_SITES=	${HOMEPAGE}/download/
+MASTER_SITES=	${HOMEPAGE}/download/betas/
 
 RUN_DEPENDS=	:tk-8.3.*:x11/tk/8.3
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
 
-DOCS=	bindings config help menus prefs startup
+DOCS=	bindings config extras help hilight lagmeter menus mirccolors \
+	oper prefs single startup xresources
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/roxirc
diff --git a/net/roxirc/distinfo b/net/roxirc/distinfo
index 28b441514cd..d8f74dd602b 100644
--- a/net/roxirc/distinfo
+++ b/net/roxirc/distinfo
@@ -1,3 +1,3 @@
-MD5 (roxirc-1.8.tar.gz) = 07b7c48761442c0a1027a33184b7b0e4
-RMD160 (roxirc-1.8.tar.gz) = 8f902de1405c166d713481e2a85abc7c9f474b18
-SHA1 (roxirc-1.8.tar.gz) = aefbaa583132914ca9a9f18ace197df434c38c69
+MD5 (roxirc-2.0.tar.gz) = dc18191dcafb0ac8d6955f69b63c9be9
+RMD160 (roxirc-2.0.tar.gz) = 48d700acfb97570d40d613726e76908ea7b65371
+SHA1 (roxirc-2.0.tar.gz) = 7acbad5d2994e91eb6d6f9dc4575169c5fcfc78d
diff --git a/net/roxirc/patches/patch-roxirc b/net/roxirc/patches/patch-roxirc
new file mode 100644
index 00000000000..eeb65dac4c0
--- /dev/null
+++ b/net/roxirc/patches/patch-roxirc
@@ -0,0 +1,12 @@
+$OpenBSD: patch-roxirc,v 1.1 2003/06/20 03:31:42 kevlo Exp $
+--- roxirc.orig	Fri Jun 20 11:21:26 2003
++++ roxirc	Fri Jun 20 11:21:51 2003
+@@ -1,7 +1,4 @@
+-#!/bin/sh
+-# \
+-if [ -x "$HOME/.roxirc/.wish" ]; then exec $HOME/.roxirc/.wish "$0" -- "$@"; elif [ `which tclkit` ]; then exec tclkit "$0" -- "$@"; elif [ `which wish` ]; then exec wish "$0" -- "$@"; else echo "Please make sure tclkit or wish is in your PATH or link $HOME/.roxirc/.wish to wish 8.3 or newer"; exit; fi;
+-
++#!/usr/local/bin/wish8.3
+ # Copyright (c) 1997-2003 Aaron Faupell (roxirc@lighter.net)
+ #
+ # Redistribution and use in source and binary forms, with or without
diff --git a/net/roxirc/pkg/PLIST b/net/roxirc/pkg/PLIST
index ffc491f65f4..2544ba52660 100644
--- a/net/roxirc/pkg/PLIST
+++ b/net/roxirc/pkg/PLIST
@@ -1,9 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/04/17 15:28:54 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/06/20 03:31:47 kevlo Exp $
 bin/roxirc
 share/doc/roxirc/bindings
 share/doc/roxirc/config
+share/doc/roxirc/extras
 share/doc/roxirc/help
+share/doc/roxirc/hilight
+share/doc/roxirc/lagmeter
 share/doc/roxirc/menus
+share/doc/roxirc/mirccolors
+share/doc/roxirc/oper
 share/doc/roxirc/prefs
+share/doc/roxirc/single
 share/doc/roxirc/startup
+share/doc/roxirc/xresources
 @dirrm share/doc/roxirc