diff --git a/www-client/w3m/patches/w3m-0.5.3.patch b/www-client/w3m/patches/w3m-0.5.3.patch
deleted file mode 100644
index efa6b2b6e..000000000
--- a/www-client/w3m/patches/w3m-0.5.3.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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/home/config/develop/lib /boot/system/develop/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/system/develop /boot/home/config/develop"
-     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/patches/w3m-0.5.3~git20200502.patchset b/www-client/w3m/patches/w3m-0.5.3~git20200502.patchset
new file mode 100644
index 000000000..1e694f9a3
--- /dev/null
+++ b/www-client/w3m/patches/w3m-0.5.3~git20200502.patchset
@@ -0,0 +1,29 @@
+From 0de4e39a049f839bf06f931ae7d74de7c597d293 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 10 Jun 2020 19:12:44 +1000
+Subject: Fix for Haiku
+
+
+diff --git a/configure.ac b/configure.ac
+index ebb3282..50854a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -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 doc-de:de_German"
+-- 
+2.26.0
+
diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3~git20200502.recipe
similarity index 81%
rename from www-client/w3m/w3m-0.5.3.recipe
rename to www-client/w3m/w3m-0.5.3~git20200502.recipe
index b34dc571d..1c507221a 100644
--- a/www-client/w3m/w3m-0.5.3.recipe
+++ b/www-client/w3m/w3m-0.5.3~git20200502.recipe
@@ -8,10 +8,11 @@ COPYRIGHT="1994-2011 Akinori ITO
 	2002-2011 Hironori SAKAMOTO
 	2002-2011 Fumitoshi UKAI"
 LICENSE="W3M"
-REVISION="5"
-SOURCE_URI="http://downloads.sf.net/w3m/w3m-$portVersion.tar.gz"
-CHECKSUM_SHA256="e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3"
-PATCHES="w3m-$portVersion.patch"
+REVISION="1"
+SOURCE_URI="https://github.com/tats/w3m/archive/v${portVersion/\~/\+}.tar.gz"
+CHECKSUM_SHA256="bfc3d076be414b76352fa487d67b0b2aa9e400aafe684e2eb66d668a1597141c"
+SOURCE_DIR="w3m-${portVersion/\~/\-}"
+PATCHES="w3m-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"
@@ -51,13 +52,14 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:nano
 	"
 
 BUILD()
 {
 	libtoolize -fci
 	autoconf
-	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
+	LIBS="-lnetwork -lbsd" runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
 	--with-editor=${portPackageLinksDir}/cmd~nano/bin/nano \
 	--with-browser=open
 	make