diff --git a/srcpkgs/w3m/patches/form.patch b/srcpkgs/w3m/patches/form.patch
new file mode 100644
index 00000000000..ecc47a51063
--- /dev/null
+++ b/srcpkgs/w3m/patches/form.patch
@@ -0,0 +1,11 @@
+--- ./form.c.orig	2015-11-03 15:57:35.871972116 -0500
++++ ./form.c	2015-11-03 15:57:54.129972326 -0500
+@@ -196,7 +196,7 @@
+ 	if (!strcasecmp(typestr, _formtypetbl[i]))
+ 	    return i;
+     }
+-    return FORM_UNKNOWN;
++    return FORM_INPUT_TEXT;
+ }
+ 
+ void
diff --git a/srcpkgs/w3m/patches/perl.patch b/srcpkgs/w3m/patches/perl.patch
new file mode 100644
index 00000000000..ee1d6729e19
--- /dev/null
+++ b/srcpkgs/w3m/patches/perl.patch
@@ -0,0 +1,22 @@
+--- ./scripts/w3mhelp.cgi.in.orig	2011-01-04 04:22:28.000000000 -0500
++++ ./scripts/w3mhelp.cgi.in	2015-11-03 16:42:22.593003004 -0500
+@@ -48,7 +48,7 @@
+ 	}
+ 	# print "tlang=$tlang\n";
+ 	eval {require "w3mhelp-funcdesc.$tlang.pl";};
+-	if (defined(%funcdesc)) {
++	if (%funcdesc) {
+ 	    $lang = $tlang;
+ 	}
+     }
+--- ./scripts/w3mman/w3mman2html.cgi.in.orig	2015-11-03 17:08:16.109020865 -0500
++++ ./scripts/w3mman/w3mman2html.cgi.in	2015-11-03 17:09:02.749021401 -0500
+@@ -220,7 +220,7 @@
+   local($p);
+ 
+   (! -d && -x) || return 0;
+-  if (! defined(%PATH)) {
++  if (!%PATH) {
+     for $p (split(":", $ENV{'PATH'})) {
+       $p =~ s@/+$@@;
+       $PATH{$p} = 1;
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 2d55457ea94..188eb16a5d0 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,7 +1,7 @@
 # Template file for 'w3m'
 pkgname=w3m
 version=0.5.3
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="
  --libexecdir=/usr/lib --enable-image=x11,fb --with-imagelib=imlib2
@@ -32,12 +32,14 @@ pre_build() {
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/w3m/xface2xpm
+
+	vlicense ${wrksrc}/doc/README
 }
 
 w3m-img_package() {
-        depends="${sourcepkg}>=${version}_${revision}"
-        short_desc+=" -- image display support"
-        pkg_install() {
-                vmove /usr/lib/w3m/w3mimgdisplay
-        }
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - image display support"
+	pkg_install() {
+		vmove /usr/lib/w3m/w3mimgdisplay
+	}
 }