diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index f6e4b37edfab..05c82eab444b 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=    2.8.4d14
+PORTVERSION=    2.8.4d16
 CATEGORIES=     www ipv6
 MASTER_SITES=   http://lynx.isc.org/current/
-DISTNAME=       ${PORTNAME}2.8.4dev.14
+DISTNAME=       ${PORTNAME}2.8.4dev.16
 
 MAINTAINER=	ache@FreeBSD.org
 
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 602abd047328..a16744fefeab 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.4dev.14.tar.bz2) = 0b9f606bdfa4c139e1faa00964c798cd
+MD5 (lynx2.8.4dev.16.tar.bz2) = 8db0588e3ce75a92455b33a11c0f6703
diff --git a/www/lynx-current/files/patch-ab b/www/lynx-current/files/patch-ab
new file mode 100644
index 000000000000..936670b8ea72
--- /dev/null
+++ b/www/lynx-current/files/patch-ab
@@ -0,0 +1,11 @@
+--- userdefs.h.bak	Fri Jun 23 19:15:08 2000
++++ userdefs.h	Mon Jan 15 22:30:35 2001
+@@ -361,7 +361,7 @@
+  * not necessarily try a different filename when they are called, making it
+  * impossible to rename the file.  Others make world-writable files.
+  */
+-/*#define USE_MKSTEMP */
++#define USE_MKSTEMP
+ 
+ /********************************
+  * Comment this line out to let the user enter his/her email address
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index f662d7cda2fe..826e66f233cd 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -1,4 +1,5 @@
 bin/lynx
+@unexec if [ -f %D/etc/lynx.cfg ] && cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.default; then rm -f %D/etc/lynx.cfg; fi
 etc/lynx.cfg.default
 @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
 @exec mkdir -p %D/share/lynx_help
@@ -78,3 +79,32 @@ share/lynx_help/lynx_url_support.html
 @dirrm share/doc/lynx
 @dirrm share/lynx_help/keystrokes
 @dirrm share/lynx_help
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+@dirrm share/locale/fr/LC_MESSAGES
+@dirrm share/locale/fr
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pt_BR/LC_MESSAGES
+@dirrm share/locale/pt_BR
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@dirrm share/locale/sl/LC_MESSAGES
+@dirrm share/locale/sl
+@dirrm share/locale/sv/LC_MESSAGES
+@dirrm share/locale/sv
+@dirrm share/locale