diff --git a/lynx-build-fixes.patch b/lynx-build-fixes.patch
new file mode 100644
index 0000000..5ab44ca
--- /dev/null
+++ b/lynx-build-fixes.patch
@@ -0,0 +1,41 @@
+diff -up lynx2-8-6/src/makefile.in.jx lynx2-8-6/src/makefile.in
+--- lynx2-8-6/src/makefile.in.jx	2006-08-31 19:37:53.000000000 -0400
++++ lynx2-8-6/src/makefile.in	2008-05-08 10:28:52.000000000 -0400
+@@ -105,7 +105,7 @@ message:
+ 	@echo "Compiling Lynx sources"
+ 
+ do_chartrans_stuff:
+-	-cd chrtrans && $(MAKE) \
++	$(MAKE) -C chrtrans \
+ 		SITE_DEFS="$(SITE_DEFS)" \
+ 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+ 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+@@ -118,7 +118,7 @@ lint:
+ 
+ clean:
+ 	rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS
+-	cd chrtrans && $(MAKE) clean
++	$(MAKE) -C chstrans clean
+ 
+ tags:
+ 	ctags *.[ch]
+@@ -185,8 +185,8 @@ TABLES= \
+  $(CHRTR)utf8_uni.h \
+  $(CHRTR)viscii_uni.h
+ 
+-$(TABLES):
+-	-cd chrtrans && $(MAKE) tables
++$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT)
++	-$(MAKE) -C chrtrans tables
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \
+@@ -195,7 +195,7 @@ UCdomap$o :	UCdomap.c \
+ 	UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
+ 
+ chrtrans/makeuctb$(BUILD_EXEEXT):
+-	cd chrtrans; make makeuctb$(BUILD_EXEEXT)
++	$(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
+ 
+ UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
+ LYCookie$o : $(top_srcdir)/userdefs.h
diff --git a/lynx-more-build-fixes.patch b/lynx-more-build-fixes.patch
new file mode 100644
index 0000000..51cb6e6
--- /dev/null
+++ b/lynx-more-build-fixes.patch
@@ -0,0 +1,96 @@
+diff -Nur lynx2-8-6-orig/makefile.in lynx2-8-6/makefile.in
+--- lynx2-8-6-orig/makefile.in	2006-09-03 18:25:39.000000000 -0500
++++ lynx2-8-6/makefile.in	2008-05-16 23:53:02.000000000 -0500
+@@ -159,12 +159,12 @@
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)"
+-	cd $(WWWINC) && $(MAKE) CC="$(CC)" \
++@MSG_DIR_MAKE@	$(MAKE) -C po CC="$(CC)" 
++	$(MAKE) -C $(WWWINC) CC="$(CC)" \
+ 		LY_CFLAGS="$(CFLAGS)" \
+ 		CPPFLAGS="$(CPPFLAGS)" \
+ 		LYFLAGS="$(SITE_LYDEFS)"
+-	cd src && $(MAKE) all CC="$(CC)" \
++	$(MAKE) -C src all CC="$(CC)" \
+ 		CFLAGS="$(CFLAGS)" \
+ 		CPPFLAGS="$(CPPFLAGS)" \
+ 		LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
+@@ -173,11 +173,11 @@
+ 		WWWLIB="../$(WWWINC)/libwww.a"
+ 
+ lint:
+-	cd $(WWWINC) && $(MAKE) LINT="$(LINT)" CC="$(CC)" \
++	$(MAKE) -C $(WWWINC) LINT="$(LINT)" CC="$(CC)" \
+ 		LY_CFLAGS="$(CFLAGS)" \
+ 		CPPFLAGS="$(CPPFLAGS)" \
+ 		LYFLAGS="$(SITE_LYDEFS)" lint
+-	cd src && $(MAKE) all LINT="$(LINT)" CC="$(CC)" \
++	$(MAKE) -C src all LINT="$(LINT)" CC="$(CC)" \
+ 		CFLAGS="$(CFLAGS)" \
+ 		CPPFLAGS="$(CPPFLAGS)" \
+ 		LIBS="$(LIBS) $(RESOLVLIB) $(WAISLIB) $(SITE_LIBS)" \
+@@ -200,25 +200,25 @@
+ clean:
+ 	rm -f WWW/Library/*/*.[aoib]
+ 	rm -f WWW/Library/*/.created
+-	cd src && $(MAKE) clean
++	$(MAKE) -C src clean
+ @MSG_DIR_MAKE@	rm -f LYMessages.c
+-@MSG_DIR_MAKE@	cd po && $(MAKE) $@
++@MSG_DIR_MAKE@	$(MAKE) -C po $@
+ 	rm -f *.b src/lynx$x *.leaks cfg_defs.h LYHelp.h lint.*
+ @LYNXCFG_MAKE@	-rm -f alphatoc.html body.html cattoc.html tmp007
+ 	rm -f help_files.sed
+ 	rm -f core *.core
+ 
+ depend: cfg_defs.h LYHelp.h
+-	cd $(WWWINC) && $(MAKE) $@
+-	cd src && $(MAKE) $@
++	$(MAKE) -C $(WWWINC) $@
++	$(MAKE) -C src $@
+ 
+ distclean: clean
+ 	-rm -f WWW/Library/*/*~
+ 	-rm -f WWW/Library/*/*.bak
+ 	-rm -rf src/obsolete
+-	-cd src && $(MAKE) $@
+-	-cd src/chrtrans && $(MAKE) $@
+-@MSG_DIR_MAKE@	cd po && $(MAKE) $@
++	-$(MAKE) -C src $@
++	-$(MAKE) -C src/chrtrans $@
++@MSG_DIR_MAKE@	$(MAKE) -C po $@
+ @MSG_DIR_MAKE@	-rmdir po
+ 	-rm -f *~ *.bak *.sav tags TAGS
+ 	-rm -f $(WWWINC)/makefile src/makefile src/chrtrans/makefile
+@@ -287,7 +287,7 @@
+ 	@echo Full installation complete.
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" install
++@MSG_DIR_MAKE@	$(MAKE) -C po CC="$(CC)" install
+ 	-mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old
+ 	$(INSTALL_PROGRAM) lynx$x $(BINDIR)/lynx$x
+ 
+@@ -405,7 +405,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
+ 
+ uninstall ::
+-@MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" uninstall
++@MSG_DIR_MAKE@	$(MAKE) -C po CC="$(CC)" uninstall
+ 	-rm -f $(BINDIR)/lynx$x
+ 	-rm -f $(MANDIR)/lynx.1
+ 	-rm -f $(SYSCONFDIR)/lynx.cfg
+diff -Nur lynx2-8-6-orig/src/makefile.in lynx2-8-6/src/makefile.in
+--- lynx2-8-6-orig/src/makefile.in	2008-05-16 23:26:20.000000000 -0500
++++ lynx2-8-6/src/makefile.in	2008-05-17 00:20:31.000000000 -0500
+@@ -195,7 +195,7 @@
+ 	UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h
+ 
+ chrtrans/makeuctb$(BUILD_EXEEXT):
+-	$(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
++	-$(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT)
+ 
+ UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h
+ LYCookie$o : $(top_srcdir)/userdefs.h
diff --git a/lynx.spec b/lynx.spec
index 59c7fb6..9b85dcc 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.6
-Release: 13%{?dist}
+Release: 16%{?dist}
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx%{version}.tar.bz2
@@ -102,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Thu May 29 2008 Jiri Moskovcak <jmoskovc@redhat.com> - 2.8.6-16
+- updated to latest stable version 2.8.6rel5
+- Resolves: #214205
+- added build patches from Dennis Gilmore
+- skipped 2 releases to correct the NVR path
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.8.6-13
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 7c18e48..d7921d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec2186504f6141e87bac3783b1208db1  lynx2.8.6.tar.bz2
+bd44c57d28fd3e4c9db1cd492d403600  lynx2.8.6.tar.bz2