diff --git a/.cvsignore b/.cvsignore
index fa8dd49..24df9dd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 ncurses-5.6.tar.gz
 ncurses-5.6-20071201-patch.sh.bz2
 ncurses-5.6-20071215-20080112.patch.bz2
+ncurses-5.6-20080119-20080301.patch.bz2
diff --git a/ncurses.spec b/ncurses.spec
index b3f8d7f..75e779e 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 5.6
-Release: 15.20080112%{?dist}
+Release: 16.20080301%{?dist}
 License: MIT
 Group: System Environment/Base
 URL: http://invisible-island.net/ncurses/ncurses.html
@@ -9,6 +9,7 @@ Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
 
 Patch1: ncurses-5.6-20071201-patch.sh.bz2
 Patch2: ncurses-5.6-20071215-20080112.patch.bz2
+Patch3: ncurses-5.6-20080119-20080301.patch.bz2
 
 Patch8: ncurses-5.5-20061209-config.patch
 Patch9: ncurses-5.6-20070612-libs.patch
@@ -69,6 +70,7 @@ Summary: Development files for the ncurses library
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: libtermcap-devel < 2.0.8-48
+Provides: libtermcap-devel = 2.0.8-48
 
 %description devel
 The header files and libraries for developing applications that use
@@ -92,6 +94,7 @@ The ncurses-static package includes static libraries of the ncurses library.
 # tack isn't in ncurses tree since 20070203
 rm -rf tack
 %patch2 -p1
+%patch3 -p1
 
 %patch8 -p1 -b .config
 %patch9 -p1 -b .libs
@@ -99,6 +102,7 @@ rm -rf tack
 %patch11 -p1 -b .urxvt
 
 # this will be in documentation, drop executable bits
+cp -p install-sh test
 chmod 644 test/*
 
 %build
@@ -107,7 +111,6 @@ chmod 644 test/*
     --with-shared --without-ada --with-ospeed=unsigned \\\
     --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
-    --includedir=%{_includedir}/ncursesw \\\
     --enable-overwrite \\\
     --with-termlib=tinfo \\\
     --with-chtype=long
@@ -134,10 +137,10 @@ make -C widec DESTDIR=$RPM_BUILD_ROOT install.{libs,includes,man}
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
 
-# move lib{ncurses,tinfo}.so.* to /lib*
+# move lib{ncurses{,w},tinfo}.so.* to /lib*
 mkdir $RPM_BUILD_ROOT/%{_lib}
-mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so.* $RPM_BUILD_ROOT/%{_lib}
-for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses,tinfo}.so; do
+mv $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/lib{ncurses{,w},tinfo}.so; do
     ln -sf $(echo %{_libdir} | \
         sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
 done
@@ -187,17 +190,18 @@ do
     echo $t
 done 2> /dev/null | sort -u | comm -2 -3 - terms.base > terms.term
 
-ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
-    ${RPM_BUILD_ROOT}%{_includedir}
-
 # can't replace directory with symlink (rpm bug), symlink all headers
-mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses
-for l in $RPM_BUILD_ROOT%{_includedir}/ncursesw/*.h; do
-    ln -s ../ncursesw/$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses
+mkdir $RPM_BUILD_ROOT%{_includedir}/ncurses{,w}
+for l in $RPM_BUILD_ROOT%{_includedir}/*.h; do
+    ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncurses
+    ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncursesw
 done
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses{,w}.so
 echo "INPUT(-lncurses)" > $RPM_BUILD_ROOT%{_libdir}/libcurses.so
+echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
+
+echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 
@@ -240,14 +244,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %dir %{_includedir}/ncursesw
 %{_includedir}/ncurses/*.h
 %{_includedir}/ncursesw/*.h
-%{_includedir}/curses.h
-%{_includedir}/ncurses.h
-%{_includedir}/eti.h
-%{_includedir}/form.h
-%{_includedir}/menu.h
-%{_includedir}/panel.h
-%{_includedir}/term.h
-%{_includedir}/unctrl.h
+%{_includedir}/*.h
 %{_mandir}/man3/*
 
 %files static
@@ -258,6 +255,13 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Mar 07 2008 Miroslav Lichvar <mlichvar@redhat.com> 5.6-16.20080301
+- update to patch 20080301
+- provide libtermcap.so (#428898)
+- move all headers to /usr/include
+- move libncursesw out of /usr
+- make examples in documentation compilable (#436355)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.6-15.20080112
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index 8c36263..a28cb99 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
 5c4c833a31064c7099209f7a141fed10  ncurses-5.6-20071201-patch.sh.bz2
 d32ba589cd7bfdc4ac82fd8078c06e2b  ncurses-5.6-20071215-20080112.patch.bz2
+0fe7ec33499e83e9a64f71ef3f555008  ncurses-5.6-20080119-20080301.patch.bz2