diff --git a/www/elinks/Makefile b/www/elinks/Makefile
new file mode 100644
index 0000000000..4df567099a
--- /dev/null
+++ b/www/elinks/Makefile
@@ -0,0 +1,52 @@
+# $OpenBSD: Makefile,v 1.1 2005/07/22 04:21:30 marco Exp $
+
+COMMENT=		"full-featured text WWW browser"
+DISTNAME=		elinks-0.10.5
+EXTRACT_SUFX=		.tar.bz2
+CATEGORIES=		www
+MASTER_SITES=		http://elinks.or.cz/download/
+
+HOMEPAGE=		http://elinks.or.cz/
+
+MAINTAINER=		James Prevatt <jprevatt+bsd@paunix.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+CONFIGURE_STYLE=	gnu
+BUILD_DEPENDS=		:automake-1.4:devel/automake/1.4
+USE_GMAKE=		Yes
+
+RUN_DEPENDS=		::devel/gettext
+WANTLIB=		crypto c z ssl
+
+FLAVORS=		gopher lua no_x11
+FLAVOR?=		
+
+.if ${FLAVOR:L:Mgopher}
+CONFIGURE_ARGS+=	--enable-gopher
+.endif
+
+.if ${FLAVOR:L:Mlua}
+LIB_DEPENDS+=		lua.5,lualib.5::lang/lua
+WANTLIB+=		m
+.else
+CONFIGURE_ARGS+=	--without-lua
+.endif
+
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+=	--without-x
+.else
+USE_X11=		Yes
+WANTLIB+=		X11
+.endif
+
+post-patch:
+	@cd ${WRKSRC} && automake-1.4 -a -c
+
+REGRESS_IS_INTERACTIVE=	Yes
+
+.include <bsd.port.mk>
diff --git a/www/elinks/distinfo b/www/elinks/distinfo
new file mode 100644
index 0000000000..4f6c9635e5
--- /dev/null
+++ b/www/elinks/distinfo
@@ -0,0 +1,4 @@
+MD5 (elinks-0.10.5.tar.bz2) = d19fea8cddd1c64ae890319650dce1ff
+RMD160 (elinks-0.10.5.tar.bz2) = f1b54cfa1eb4375a20b4b4e1a6edcc589739c3a2
+SHA1 (elinks-0.10.5.tar.bz2) = f05fcb5194bd5a6b43ed4bc09880de7577cbcce0
+SIZE (elinks-0.10.5.tar.bz2) = 2357709
diff --git a/www/elinks/patches/patch-Makefile_base b/www/elinks/patches/patch-Makefile_base
new file mode 100644
index 0000000000..b667f00eb2
--- /dev/null
+++ b/www/elinks/patches/patch-Makefile_base
@@ -0,0 +1,9 @@
+$OpenBSD: patch-Makefile_base,v 1.1 2005/07/22 04:21:30 marco Exp $
+--- Makefile.base.orig	Thu Apr 29 10:17:12 2004
++++ Makefile.base	Wed May 25 11:29:47 2005
+@@ -13,4 +13,4 @@ COMPILE = $(CC) @DEFS@ $(INCLUDES) $(AM_
+ # Rule for getting test dependencies right. This is a workaround since
+ # automake doesn't support defining subdirs sources.
+ testutils:
+-	make -C $(top_builddir)/src/util CPPFLAGS="-DDEBUG"
++	$(MAKE) -C $(top_builddir)/src/util CPPFLAGS="-DDEBUG"
diff --git a/www/elinks/pkg/DESCR b/www/elinks/pkg/DESCR
new file mode 100644
index 0000000000..300ba16a8e
--- /dev/null
+++ b/www/elinks/pkg/DESCR
@@ -0,0 +1,9 @@
+ELinks is an advanced and well-established feature-rich text mode web
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is highly
+customizable and can be extended via Lua or Guile scripts. It is very
+portable and runs on a variety of platforms.
+
+Flavors:
+        gopher     - build with gopher support
+        no_lua     - build without Lua support
+        no_x11     - build without X11 support
diff --git a/www/elinks/pkg/PLIST b/www/elinks/pkg/PLIST
new file mode 100644
index 0000000000..a758ae3538
--- /dev/null
+++ b/www/elinks/pkg/PLIST
@@ -0,0 +1,44 @@
+@comment $OpenBSD: PLIST,v 1.1 2005/07/22 04:21:30 marco Exp $
+bin/elinks
+@comment lib/charset.alias
+@man man/man1/elinks.1
+@man man/man5/elinks.conf.5
+@man man/man5/elinkskeys.5
+@comment share/locale/be/
+@comment share/locale/be/LC_MESSAGES/
+share/locale/be/LC_MESSAGES/elinks.mo
+share/locale/bg/LC_MESSAGES/elinks.mo
+@comment share/locale/ca/
+@comment share/locale/ca/LC_MESSAGES/
+share/locale/ca/LC_MESSAGES/elinks.mo
+share/locale/cs/LC_MESSAGES/elinks.mo
+share/locale/da/LC_MESSAGES/elinks.mo
+share/locale/de/LC_MESSAGES/elinks.mo
+share/locale/el/LC_MESSAGES/elinks.mo
+share/locale/es/LC_MESSAGES/elinks.mo
+share/locale/et/LC_MESSAGES/elinks.mo
+share/locale/fi/LC_MESSAGES/elinks.mo
+share/locale/fr/LC_MESSAGES/elinks.mo
+share/locale/gl/LC_MESSAGES/elinks.mo
+share/locale/hr/LC_MESSAGES/elinks.mo
+share/locale/hu/LC_MESSAGES/elinks.mo
+share/locale/id/LC_MESSAGES/elinks.mo
+@comment share/locale/is/
+@comment share/locale/is/LC_MESSAGES/
+share/locale/is/LC_MESSAGES/elinks.mo
+share/locale/it/LC_MESSAGES/elinks.mo
+@comment share/locale/locale.alias
+@comment share/locale/lt/
+@comment share/locale/lt/LC_MESSAGES/
+share/locale/lt/LC_MESSAGES/elinks.mo
+share/locale/nl/LC_MESSAGES/elinks.mo
+share/locale/no/LC_MESSAGES/elinks.mo
+share/locale/pl/LC_MESSAGES/elinks.mo
+share/locale/pt/LC_MESSAGES/elinks.mo
+share/locale/pt_BR/LC_MESSAGES/elinks.mo
+share/locale/ro/LC_MESSAGES/elinks.mo
+share/locale/ru/LC_MESSAGES/elinks.mo
+share/locale/sk/LC_MESSAGES/elinks.mo
+share/locale/sv/LC_MESSAGES/elinks.mo
+share/locale/tr/LC_MESSAGES/elinks.mo
+share/locale/uk/LC_MESSAGES/elinks.mo