diff --git a/www/Makefile b/www/Makefile
index 889cd03e9aaf..cac82557f2a7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2241,6 +2241,7 @@
     SUBDIR += subsonic-standalone
     SUBDIR += suphp
     SUBDIR += surf
+    SUBDIR += surfraw
     SUBDIR += swiggle
     SUBDIR += tcexam
     SUBDIR += tclhttpd
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
new file mode 100644
index 000000000000..9b019b3bfb76
--- /dev/null
+++ b/www/surfraw/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	surfraw
+PORTVERSION=	2.2.9
+CATEGORIES=	www
+MASTER_SITES=	http://surfraw.alioth.debian.org/dist/
+
+MAINTAINER=	jadawin@FreeBSD.org
+COMMENT=	Command line interface to popular WWW search engines
+
+GNU_CONFIGURE=	yes
+USES=		perl5 gmake
+
+post-patch:	.SILENT
+	${REINPLACE_CMD} '\|xdg/surfraw|d' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' \
+		-e 's/^function[[:space:]]//' \
+		${WRKSRC}/examples/uzbl_load_url_from_surfraw.IN
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/uzbl_load_url_from_surfraw \
+		${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
+	${INSTALL_DATA} ${WRKSRC}/surfraw-bash-completion \
+		${STAGEDIR}${PREFIX}/etc/bash_completion.d/surfraw
+.for f in surfraw.bookmarks surfraw.conf
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample
+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/${f} ]; then \
+		${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/${f}.sample \
+			${STAGEDIR}${PREFIX}/etc/${f}; \
+	fi
+.endfor
+
+.include "${.CURDIR}/manpages"
+.include <bsd.port.mk>
diff --git a/www/surfraw/manpages b/www/surfraw/manpages
new file mode 100644
index 000000000000..87239bc87e28
--- /dev/null
+++ b/www/surfraw/manpages
@@ -0,0 +1,113 @@
+MLINKS= \
+elvi.1sr W.1 \
+elvi.1sr acronym.1sr \
+elvi.1sr ads.1sr \
+elvi.1sr alioth.1sr \
+elvi.1sr amazon.1sr \
+elvi.1sr archpkg.1sr \
+elvi.1sr archwiki.1sr \
+elvi.1sr arxiv.1sr \
+elvi.1sr ask.1sr \
+elvi.1sr aur.1sr \
+elvi.1sr austlii.1sr \
+elvi.1sr bbcnews.1sr \
+elvi.1sr bing.1sr \
+elvi.1sr bookfinder.1sr \
+elvi.1sr bugmenot.1sr \
+elvi.1sr bugzilla.1sr \
+elvi.1sr cablesearch.1sr \
+elvi.1sr cia.1sr \
+elvi.1sr cite.1sr \
+elvi.1sr cliki.1sr \
+elvi.1sr cnn.1sr \
+elvi.1sr codesearch.1sr \
+elvi.1sr comlaw.1sr \
+elvi.1sr ctan.1sr \
+elvi.1sr currency.1sr \
+elvi.1sr cve.1sr \
+elvi.1sr debbugs.1sr \
+elvi.1sr debcontents.1sr \
+elvi.1sr deblists.1sr \
+elvi.1sr deblogs.1sr \
+elvi.1sr debpackages.1sr \
+elvi.1sr debpkghome.1sr \
+elvi.1sr debpts.1sr \
+elvi.1sr debsec.1sr \
+elvi.1sr debvcsbrowse.1sr \
+elvi.1sr debwiki.1sr \
+elvi.1sr deja.1sr \
+elvi.1sr deli.1sr \
+elvi.1sr discogs.1sr \
+elvi.1sr dmoz.1sr \
+elvi.1sr duckduckgo.1sr \
+elvi.1sr ebay.1sr \
+elvi.1sr etym.1sr \
+elvi.1sr excite.1sr \
+elvi.1sr finkpkg.1sr \
+elvi.1sr foldoc.1sr \
+elvi.1sr freebsd.1sr \
+elvi.1sr freedb.1sr \
+elvi.1sr freshmeat.1sr \
+elvi.1sr fsfdir.1sr \
+elvi.1sr gcache.1sr \
+elvi.1sr genbugs.1sr \
+elvi.1sr genportage.1sr \
+elvi.1sr google.1sr \
+elvi.1sr gutenberg.1sr \
+elvi.1sr happypenguin.1sr \
+elvi.1sr imdb.1sr \
+elvi.1sr ixquick.1sr \
+elvi.1sr jamendo.1sr \
+elvi.1sr javasun.1sr \
+elvi.1sr l1sp.1sr \
+elvi.1sr lastfm.1sr \
+elvi.1sr leodict.1sr \
+elvi.1sr lsm.1sr \
+elvi.1sr macports.1sr \
+elvi.1sr mathworld.1sr \
+elvi.1sr mininova.1sr \
+elvi.1sr musicbrainz.1sr \
+elvi.1sr netbsd.1sr \
+elvi.1sr ntrs.1sr \
+elvi.1sr openbsd.1sr \
+elvi.1sr openports.1sr \
+elvi.1sr opensearch.1sr \
+elvi.1sr pasearch.1sr \
+elvi.1sr pgpkeys.1sr \
+elvi.1sr piratebay.1sr \
+elvi.1sr pubmed.1sr \
+elvi.1sr rae.1sr \
+elvi.1sr rfc.1sr \
+elvi.1sr rhyme.1sr \
+elvi.1sr rpmsearch.1sr \
+elvi.1sr scholar.1sr \
+elvi.1sr scicom.1sr \
+elvi.1sr scirus.1sr \
+elvi.1sr scitopia.1sr \
+elvi.1sr scpan.1sr \
+elvi.1sr scroogle.1sr \
+elvi.1sr slashdot.1sr \
+elvi.1sr slinuxdoc.1sr \
+elvi.1sr sourceforge.1sr \
+elvi.1sr springer.1sr \
+elvi.1sr stockquote.1sr \
+elvi.1sr stack.1sr \
+elvi.1sr sunonesearch.1sr \
+elvi.1sr thesaurus.1sr \
+elvi.1sr translate.1sr \
+elvi.1sr urban.1sr \
+elvi.1sr w3css.1sr \
+elvi.1sr w3html.1sr \
+elvi.1sr w3link.1sr \
+elvi.1sr w3rdf.1sr \
+elvi.1sr wayback.1sr \
+elvi.1sr webster.1sr \
+elvi.1sr wetandwild.1sr \
+elvi.1sr wikipedia.1sr \
+elvi.1sr woffle.1sr \
+elvi.1sr worldwidescience.1sr \
+elvi.1sr yahoo.1sr \
+elvi.1sr yandex.1sr \
+elvi.1sr youtube.1sr \
+elvi.1sr yubnub.1sr \
+surfraw.1 sr.1
diff --git a/www/surfraw/pkg-plist b/www/surfraw/pkg-plist
new file mode 100644
index 000000000000..036ae857fbed
--- /dev/null
+++ b/www/surfraw/pkg-plist
@@ -0,0 +1,261 @@
+bin/opensearch-discover
+bin/opensearch-genquery
+bin/sr
+bin/surfraw
+bin/surfraw-update-path
+bin/uzbl_load_url_from_surfraw
+etc/bash_completion.d/surfraw
+@unexec if cmp -s %D/etc/surfraw.bookmarks.sample %D/etc/surfraw.bookmarks; then rm -f %D/etc/surfraw.bookmarks; fi
+etc/surfraw.bookmarks.sample
+@exec if [ ! -f %B/surfraw.bookmarks ]; then cp -p %D/%F %B/surfraw.bookmarks; fi
+@unexec if cmp -s %D/etc/surfraw.conf.sample %D/etc/surfraw.conf; then rm -f %D/etc/surfraw.conf; fi
+etc/surfraw.conf.sample
+@exec if [ ! -f %B/surfraw.conf ]; then cp -p %D/%F %B/surfraw.conf; fi
+lib/surfraw/W
+lib/surfraw/acronym
+lib/surfraw/ads
+lib/surfraw/alioth
+lib/surfraw/amazon
+lib/surfraw/archpkg
+lib/surfraw/archwiki
+lib/surfraw/arxiv
+lib/surfraw/ask
+lib/surfraw/aur
+lib/surfraw/austlii
+lib/surfraw/bbcnews
+lib/surfraw/bing
+lib/surfraw/bookfinder
+lib/surfraw/bugmenot
+lib/surfraw/bugzilla
+lib/surfraw/cablesearch
+lib/surfraw/cia
+lib/surfraw/cisco
+lib/surfraw/cite
+lib/surfraw/cliki
+lib/surfraw/cnn
+lib/surfraw/comlaw
+lib/surfraw/ctan
+lib/surfraw/currency
+lib/surfraw/cve
+lib/surfraw/debbugs
+lib/surfraw/debcodesearch
+lib/surfraw/debcontents
+lib/surfraw/deblists
+lib/surfraw/deblogs
+lib/surfraw/debpackages
+lib/surfraw/debpkghome
+lib/surfraw/debpts
+lib/surfraw/debsec
+lib/surfraw/debvcsbrowse
+lib/surfraw/debwiki
+lib/surfraw/deja
+lib/surfraw/deli
+lib/surfraw/discogs
+lib/surfraw/dmoz
+lib/surfraw/duckduckgo
+lib/surfraw/ebay
+lib/surfraw/etym
+lib/surfraw/excite
+lib/surfraw/f5
+lib/surfraw/finkpkg
+lib/surfraw/foldoc
+lib/surfraw/freebsd
+lib/surfraw/freedb
+lib/surfraw/freshmeat
+lib/surfraw/fsfdir
+lib/surfraw/gcache
+lib/surfraw/genbugs
+lib/surfraw/genportage
+lib/surfraw/github
+lib/surfraw/gmane
+lib/surfraw/google
+lib/surfraw/gutenberg
+lib/surfraw/imdb
+lib/surfraw/ixquick
+lib/surfraw/jamendo
+lib/surfraw/javasun
+lib/surfraw/jquery
+lib/surfraw/l1sp
+lib/surfraw/lastfm
+lib/surfraw/leodict
+lib/surfraw/lsm
+lib/surfraw/macports
+lib/surfraw/mathworld
+lib/surfraw/mdn
+lib/surfraw/mininova
+lib/surfraw/musicbrainz
+lib/surfraw/mysqldoc
+lib/surfraw/netbsd
+lib/surfraw/ntrs
+lib/surfraw/openbsd
+lib/surfraw/opensearch
+lib/surfraw/openports
+lib/surfraw/oraclesearch
+lib/surfraw/pasearch
+lib/surfraw/pgdoc
+lib/surfraw/pgpkeys
+lib/surfraw/phpdoc
+lib/surfraw/pin
+lib/surfraw/piratebay
+lib/surfraw/priberam
+lib/surfraw/pubmed
+lib/surfraw/rae
+lib/surfraw/rfc
+lib/surfraw/rhyme
+lib/surfraw/rpmsearch
+lib/surfraw/S
+lib/surfraw/scholar
+lib/surfraw/scicom
+lib/surfraw/scirus
+lib/surfraw/scpan
+lib/surfraw/slashdot
+lib/surfraw/slinuxdoc
+lib/surfraw/sourceforge
+lib/surfraw/springer
+lib/surfraw/stack
+lib/surfraw/stockquote
+lib/surfraw/thesaurus
+lib/surfraw/translate
+lib/surfraw/urban
+lib/surfraw/w3css
+lib/surfraw/w3html
+lib/surfraw/w3link
+lib/surfraw/w3rdf
+lib/surfraw/wayback
+lib/surfraw/webster
+lib/surfraw/wetandwild
+lib/surfraw/wikipedia
+lib/surfraw/woffle
+lib/surfraw/wolfram
+lib/surfraw/worldwidescience
+lib/surfraw/yacy
+lib/surfraw/yahoo
+lib/surfraw/yandex
+lib/surfraw/youtube
+lib/surfraw/yubnub
+man/man1/S.1sr.gz
+man/man1/W.1.gz
+man/man1/acronym.1sr.gz
+man/man1/ads.1sr.gz
+man/man1/alioth.1sr.gz
+man/man1/amazon.1sr.gz
+man/man1/archpkg.1sr.gz
+man/man1/archwiki.1sr.gz
+man/man1/arxiv.1sr.gz
+man/man1/ask.1sr.gz
+man/man1/aur.1sr.gz
+man/man1/austlii.1sr.gz
+man/man1/bbcnews.1sr.gz
+man/man1/bing.1sr.gz
+man/man1/bookfinder.1sr.gz
+man/man1/bugmenot.1sr.gz
+man/man1/bugzilla.1sr.gz
+man/man1/cablesearch.1sr.gz
+man/man1/cia.1sr.gz
+man/man1/cite.1sr.gz
+man/man1/cliki.1sr.gz
+man/man1/cnn.1sr.gz
+man/man1/comlaw.1sr.gz
+man/man1/ctan.1sr.gz
+man/man1/currency.1sr.gz
+man/man1/cve.1sr.gz
+man/man1/debbugs.1sr.gz
+man/man1/debcodesearch.1sr.gz
+man/man1/debcontents.1sr.gz
+man/man1/deblists.1sr.gz
+man/man1/deblogs.1sr.gz
+man/man1/debpackages.1sr.gz
+man/man1/debpkghome.1sr.gz
+man/man1/debpts.1sr.gz
+man/man1/debsec.1sr.gz
+man/man1/debvcsbrowse.1sr.gz
+man/man1/debwiki.1sr.gz
+man/man1/deja.1sr.gz
+man/man1/deli.1sr.gz
+man/man1/discogs.1sr.gz
+man/man1/dmoz.1sr.gz
+man/man1/duckduckgo.1sr.gz
+man/man1/ebay.1sr.gz
+man/man1/elvi.1sr.gz
+man/man1/etym.1sr.gz
+man/man1/excite.1sr.gz
+man/man1/finkpkg.1sr.gz
+man/man1/foldoc.1sr.gz
+man/man1/freebsd.1sr.gz
+man/man1/freedb.1sr.gz
+man/man1/freshmeat.1sr.gz
+man/man1/fsfdir.1sr.gz
+man/man1/gcache.1sr.gz
+man/man1/genbugs.1sr.gz
+man/man1/genportage.1sr.gz
+man/man1/github.1sr.gz
+man/man1/google.1sr.gz
+man/man1/gutenberg.1sr.gz
+man/man1/imdb.1sr.gz
+man/man1/ixquick.1sr.gz
+man/man1/jamendo.1sr.gz
+man/man1/javasun.1sr.gz
+man/man1/l1sp.1sr.gz
+man/man1/lastfm.1sr.gz
+man/man1/leodict.1sr.gz
+man/man1/lsm.1sr.gz
+man/man1/macports.1sr.gz
+man/man1/mathworld.1sr.gz
+man/man1/mdn.1sr.gz
+man/man1/mininova.1sr.gz
+man/man1/musicbrainz.1sr.gz
+man/man1/mysqldoc.1sr.gz
+man/man1/netbsd.1sr.gz
+man/man1/ntrs.1sr.gz
+man/man1/openbsd.1sr.gz
+man/man1/openports.1sr.gz
+man/man1/opensearch-discover.1.gz
+man/man1/opensearch-genquery.1.gz
+man/man1/opensearch.1sr.gz
+man/man1/oraclesearch.1sr.gz
+man/man1/pasearch.1sr.gz
+man/man1/pgdoc.1sr.gz
+man/man1/pgpkeys.1sr.gz
+man/man1/phpdoc.1sr.gz
+man/man1/pin.1sr.gz
+man/man1/piratebay.1sr.gz
+man/man1/priberam.1sr.gz
+man/man1/pubmed.1sr.gz
+man/man1/rae.1sr.gz
+man/man1/rfc.1sr.gz
+man/man1/rhyme.1sr.gz
+man/man1/rpmsearch.1sr.gz
+man/man1/scholar.1sr.gz
+man/man1/scicom.1sr.gz
+man/man1/scirus.1sr.gz
+man/man1/scpan.1sr.gz
+man/man1/slashdot.1sr.gz
+man/man1/slinuxdoc.1sr.gz
+man/man1/sourceforge.1sr.gz
+man/man1/springer.1sr.gz
+man/man1/sr.1.gz
+man/man1/stack.1sr.gz
+man/man1/stockquote.1sr.gz
+man/man1/surfraw-update-path.1.gz
+man/man1/surfraw.1.gz
+man/man1/thesaurus.1sr.gz
+man/man1/translate.1sr.gz
+man/man1/urban.1sr.gz
+man/man1/w3css.1sr.gz
+man/man1/w3html.1sr.gz
+man/man1/w3link.1sr.gz
+man/man1/w3rdf.1sr.gz
+man/man1/wayback.1sr.gz
+man/man1/webster.1sr.gz
+man/man1/wetandwild.1sr.gz
+man/man1/wikipedia.1sr.gz
+man/man1/wolfram.1sr.gz
+man/man1/woffle.1sr.gz
+man/man1/worldwidescience.1sr.gz
+man/man1/yacy.1sr.gz
+man/man1/yahoo.1sr.gz
+man/man1/yandex.1sr.gz
+man/man1/youtube.1sr.gz
+man/man1/yubnub.1sr.gz
+@dirrmtry etc/bash_completion.d
+@dirrm lib/surfraw