diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 97a8dbc83d2..8c7be0b4e47 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2001/11/09 02:16:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2001/12/25 17:26:50 naddy Exp $
 
 COMMENT=	"command line interface to popular WWW search engines"
 
-PKGNAME=	${DISTNAME}p1
-DISTNAME=	surfraw-1.0.5
+DISTNAME=	surfraw-1.0.7
 CATEGORIES=	www
 NEED_VERSION=	1.363
 HOMEPAGE=	http://surfraw.sourceforge.net/
diff --git a/www/surfraw/distinfo b/www/surfraw/distinfo
new file mode 100644
index 00000000000..add8d724eaa
--- /dev/null
+++ b/www/surfraw/distinfo
@@ -0,0 +1,3 @@
+MD5 (surfraw-1.0.7.tar.gz) = 0957382bbdebf3d678879fa5d2592c9d
+RMD160 (surfraw-1.0.7.tar.gz) = 3203fa661ddfaa7456aa2efb236adc748f7ae341
+SHA1 (surfraw-1.0.7.tar.gz) = 1b99367066b0b0f05c2f97bd1f21fca2aeede0b9
diff --git a/www/surfraw/files/md5 b/www/surfraw/files/md5
deleted file mode 100644
index 1d25089a062..00000000000
--- a/www/surfraw/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (surfraw-1.0.5.tar.gz) = 3f9c64da02b2ff8cfee70601973cbe8a
-RMD160 (surfraw-1.0.5.tar.gz) = ce81bebafb20a215bcc6def623c0e17dbf8f2782
-SHA1 (surfraw-1.0.5.tar.gz) = c90e2f87a17e95f7e7b3c4be0945e502fe54145a
diff --git a/www/surfraw/patches/patch-elvi_Makefile_am b/www/surfraw/patches/patch-elvi_Makefile_am
index 6208352d1f0..a03c30d0b4b 100644
--- a/www/surfraw/patches/patch-elvi_Makefile_am
+++ b/www/surfraw/patches/patch-elvi_Makefile_am
@@ -1,7 +1,7 @@
-$OpenBSD: patch-elvi_Makefile_am,v 1.2 2001/10/26 23:39:44 naddy Exp $
---- elvi/Makefile.am.orig	Fri Oct 26 21:59:28 2001
-+++ elvi/Makefile.am	Fri Oct 26 21:59:54 2001
-@@ -39,7 +39,7 @@ bin_SCRIPTS	= \
+$OpenBSD: patch-elvi_Makefile_am,v 1.3 2001/12/25 17:26:50 naddy Exp $
+--- elvi/Makefile.am.orig	Sun Dec 23 11:15:17 2001
++++ elvi/Makefile.am	Mon Dec 24 19:52:05 2001
+@@ -43,7 +43,7 @@ bin_SCRIPTS	= \
  		  woffle \
  		  xxx \
  		  yahoo
diff --git a/www/surfraw/patches/patch-elvi_Makefile_in b/www/surfraw/patches/patch-elvi_Makefile_in
index f3101c198b8..f442b93c1e1 100644
--- a/www/surfraw/patches/patch-elvi_Makefile_in
+++ b/www/surfraw/patches/patch-elvi_Makefile_in
@@ -1,8 +1,8 @@
---- elvi/Makefile.in.orig	Fri Oct 26 22:00:03 2001
-+++ elvi/Makefile.in	Fri Oct 26 22:02:42 2001
+--- elvi/Makefile.in.orig	Sun Dec 23 11:18:10 2001
++++ elvi/Makefile.in	Mon Dec 24 19:52:05 2001
 @@ -70,14 +70,14 @@ sr_text_browser = @sr_text_browser@
  
- bin_SCRIPTS =  		  altavista 		  amazon 		  appwatch 		  ask 		  austlii 		  britannica 		  cite 		  cnn 		  currency 		  debbugs 		  debcontents 		  debpackages 		  deja 		  excite 		  fast 		  ftpsearch 		  freshmeat 		  jake 		  google 		  linuxdoc 		  netbsd 		  pubmed 		  raging 		  rhyme 		  slashdot 		  sundocs 		  sourceforge 		  stockquote 		  scaleplus 		  sunsolve 		  swhois 		  thesaurus 		  translate 		  W 		  webster 		  wetandwild 		  woffle 		  xxx 		  yahoo
+ bin_SCRIPTS =  		  altavista 		  amazon 		  appwatch 		  ask 		  austlii 		  britannica 		  cite 		  cnn 		  currency 		  debbugs 		  debcontents 		  debpackages 		  deja 		  excite 		  fast 		  filesearching 		  freebsd 		  ftpfind 		  ftpsearch 		  freshmeat 		  jake 		  google 		  slinuxdoc 		  netbsd 		  openbsd 		  pubmed 		  raging 		  rhyme 		  slashdot 		  sundocs 		  sourceforge 		  stockquote 		  scaleplus 		  sunsolve 		  swhois 		  thesaurus 		  translate 		  W 		  webster 		  wetandwild 		  woffle 		  xxx 		  yahoo
  
 -sysconf_DATA = surfraw_elvi.list
 +pkgdata_DATA = surfraw_elvi.list
diff --git a/www/surfraw/patches/patch-elvi_netbsd b/www/surfraw/patches/patch-elvi_netbsd
deleted file mode 100644
index 5f3bda2c118..00000000000
--- a/www/surfraw/patches/patch-elvi_netbsd
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-elvi_netbsd,v 1.1 2001/11/09 02:16:22 naddy Exp $
---- elvi/netbsd.orig	Mon Jan 15 08:57:21 2001
-+++ elvi/netbsd	Fri Nov  9 03:02:48 2001
-@@ -68,6 +68,6 @@ fi
- if test -z "$escaped_args"; then
-     w3_browse_url "http://www.netbsd.org/"
- else
--    w3_browse_url "http://www.netbsd.org/cgi-bin/htsearch?method=and&format=builtin-long&sort=score&config=htdig&words=${escaped_args}"
-+    w3_browse_url "http://www.google.com/custom?q=${escaped_args}&cof=LW%3A247%3BL%3Ahttp%3A%2F%2Fwww.netbsd.org%2Fimages%2FNetBSD-smaller.jpg%3BLH%3A241%3BAH%3Acenter%3BAWFID%3A4f6b0499f0f58d2c%3B&domains=netbsd.org&sitesearch=netbsd.org"
- fi
- exit $?
diff --git a/www/surfraw/pkg/PLIST b/www/surfraw/pkg/PLIST
index 1e2ef6d4e38..a0b95378844 100644
--- a/www/surfraw/pkg/PLIST
+++ b/www/surfraw/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2001/10/26 23:39:44 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/12/25 17:26:50 naddy Exp $
 bin/W
 bin/altavista
 bin/amazon
@@ -15,17 +15,21 @@ bin/debpackages
 bin/deja
 bin/excite
 bin/fast
+bin/filesearching
+bin/freebsd
 bin/freshmeat
+bin/ftpfind
 bin/ftpsearch
 bin/google
 bin/jake
-bin/linuxdoc
 bin/netbsd
+bin/openbsd
 bin/pubmed
 bin/raging
 bin/rhyme
 bin/scaleplus
 bin/slashdot
+bin/slinuxdoc
 bin/sourceforge
 bin/stockquote
 bin/sundocs