diff --git a/www-client/w3m/licenses/W3M b/www-client/w3m/licenses/W3M
new file mode 100644
index 000000000..a7e0282f8
--- /dev/null
+++ b/www-client/w3m/licenses/W3M
@@ -0,0 +1,11 @@
+ (C) Copyright 1994-2002 by Akinori Ito
+ (C) Copyright 2002-2011 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
+
+Use, modification and redistribution of this software is hereby granted, 
+provided that this entire copyright notice is included on any copies of 
+this software and applications and derivations thereof.
+
+This software is provided on an "as is" basis, without warranty of any
+kind, either expressed or implied, as to any matter including, but not
+limited to warranty of fitness of purpose, or merchantability, or
+results obtained from use of this software.
diff --git a/www-client/w3m/patches/w3m-0.5.3.patch b/www-client/w3m/patches/w3m-0.5.3.patch
new file mode 100644
index 000000000..b7a47197b
--- /dev/null
+++ b/www-client/w3m/patches/w3m-0.5.3.patch
@@ -0,0 +1,74 @@
+diff -up w3m-0.5.3/acinclude.m4.orig w3m-0.5.3/acinclude.m4
+--- w3m-0.5.3/acinclude.m4.orig	2011-01-04 02:22:18.056885248 -0700
++++ w3m-0.5.3/acinclude.m4	2012-05-04 23:23:51.741605376 -0600
+@@ -382,7 +382,7 @@ AC_DEFUN([AC_W3M_EXTLIBS],
+ [lib=$1
+  AC_MSG_CHECKING(for -l$lib)
+  extlib="not found"
+- for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64
++ for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64 /boot/common/lib /boot/develop/abi/current/lib
+  do
+    if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then 
+     LIBS="$LIBS -l$lib"
+@@ -420,7 +420,7 @@ AC_ARG_WITH(gc,
+  [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])],
+  [with_gc="yes"])
+  AC_MSG_RESULT($with_gc)
+- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}"
++ test x"$with_gc" = xyes && with_gc="/usr /usr/local /boot/common ${HOME}"
+  unset ac_cv_header_gc_h
+  AC_CHECK_HEADER(gc.h)
+  if test x"$ac_cv_header_gc_h" = xno; then
+@@ -477,7 +477,7 @@ AC_MSG_RESULT($with_ssl)
+ if test x"$with_ssl" != xno; then
+   PKG_CHECK_MODULES(SSL, openssl,,[
+     AC_MSG_CHECKING(for SSL library/header)
+-    test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
++    test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local /boot/common"
+     AC_MSG_RESULT($with_ssl)
+     for dir in $with_ssl
+     do
+diff -up w3m-0.5.3/configure.ac.orig w3m-0.5.3/configure.ac
+--- w3m-0.5.3/configure.ac.orig	2011-01-14 20:01:55.044826624 -0700
++++ w3m-0.5.3/configure.ac	2012-05-04 23:25:37.043778048 -0600
+@@ -82,7 +82,7 @@ AC_W3M_MAILER
+ AC_W3M_EXT_BROWSER
+ 
+ dnl Checks for ext libs
+-for lib in bsd BSD 44bsd socket nsl dld dl
++for lib in bsd BSD 44bsd socket network nsl dld dl
+ do
+  AC_W3M_EXTLIBS($lib)
+ done
+@@ -169,7 +169,14 @@ AC_SUBST(HELP_DIR)
+ HELP_DIR="$datadir/$PACKAGE"
+ AC_DEFINE(HELP_DIR, "$HELP_DIR")
+ AC_SUBST(RC_DIR)
+-RC_DIR="~/.$PACKAGE"
++case "$host_os" in
++  *haiku*)
++    RC_DIR="~/config/settings/$PACKAGE"
++    ;;
++  *)
++    RC_DIR="~/.$PACKAGE"
++    ;;
++esac
+ AC_DEFINE(RC_DIR, "$RC_DIR")
+ AC_SUBST(DOCDIRS)
+ DOCDIRS="doc:en_English doc-jp:ja_Japanese"
+diff -up w3m-0.5.3/main.c.orig w3m-0.5.3/main.c
+--- w3m-0.5.3/main.c.orig	2011-01-04 02:42:19.049807360 -0700
++++ w3m-0.5.3/main.c	2012-05-04 23:23:51.778305536 -0600
+@@ -833,7 +833,12 @@ main(int argc, char **argv, char **envp)
+     mySignal(SIGPIPE, SigPipe);
+ #endif
+ 
++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
++    orig_GC_warn_proc = GC_get_warn_proc();
++    GC_set_warn_proc(wrap_GC_warn_proc);
++#else
+     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
++#endif
+     err_msg = Strnew();
+     if (load_argc == 0) {
+ 	/* no URL specified */
diff --git a/www-client/w3m/w3m-0.5.3.bep b/www-client/w3m/w3m-0.5.3.bep
new file mode 100644
index 000000000..fc8b1b292
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3.bep
@@ -0,0 +1,30 @@
+DESCRIPTION="Text based WWW browser, supports tables and frames" 
+HOMEPAGE="http://w3m.sourceforge.net/" 
+SRC_URI="http://sourceforge.net/projects/w3m/files/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz/download"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/boehm-gc >= 7.2_alpha6
+		sys-libs/ncurses >= 5.9
+		dev-libs/openssl >= 0.9.8l
+		sys-devel/gettext >= 0.17"
+CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc"
+BUILD {
+	cd w3m-0.5.3
+	libtoolize -fci
+	autoconf
+	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
+	--sysconfdir="$(finddir B_COMMON_SETTINGS_DIRECTORY)" \
+	--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
+	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)"
+	make
+}
+
+INSTALL {
+	cd w3m-0.5.3
+	make install
+}
+
+LICENSE="W3M"
+COPYRIGHT="1994-2011 Akinori ITO
+		2002-2011 Hironori SAKAMOTO
+		2002-2011 Fumitoshi UKAI"