diff --git a/.cvsignore b/.cvsignore
index b882b2b..68c1482 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 ncurses-5.6.tar.gz
 ncurses-5.6-20061223-20070120.patch.bz2
+ncurses-5.6-20070127-20070203.patch.bz2
diff --git a/ncurses.spec b/ncurses.spec
index 454b8e8..7b9dec9 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,13 +1,14 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.6
-Release: 2.20070120%{?dist}
-License: distributable
+Release: 3.20070203%{?dist}
+License: MIT
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
 Source0: ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
 
 Patch1: ncurses-5.6-20061223-20070120.patch.bz2
+Patch2: ncurses-5.6-20070127-20070203.patch.bz2
 
 Patch6: ncurses-5.5-20061209-tgetent.patch
 Patch8: ncurses-5.5-20061209-config.patch
@@ -27,7 +28,6 @@ discontinued 4.4 BSD classic curses library.
 Summary: Development files for the ncurses library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Obsoletes: ncurses-c++-devel
 
 %description devel
 The header files and libraries for developing applications that use
@@ -48,6 +48,9 @@ Use the following compiler flags to build against the ncurses library:
 %setup -q
 
 %patch1 -p1
+%patch2 -p1
+# tack isn't in ncurses tree since 20070203
+rm -rf tack
 
 %patch6 -p1 -b .tgetent
 %patch8 -p1 -b .config
@@ -55,12 +58,14 @@ Use the following compiler flags to build against the ncurses library:
 %patch10 -p1 -b .xterm
 %patch11 -p1 -b .urxvt
 
+# this will be in documentation, drop executable bits
+chmod 644 test/*
+
 %build
 %define rootdatadir /lib
 %define ncurses_options \\\
     --with-shared --without-ada --with-ospeed=unsigned \\\
     --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
-    --with-install-prefix=$RPM_BUILD_ROOT \\\
     --with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
     --includedir=%{_includedir}/ncursesw \\\
     --enable-overwrite \\\
@@ -72,7 +77,6 @@ ln -s ../configure .
 %configure %{ncurses_options} --with-ticlib
 make %{?_smp_mflags} libs
 make %{?_smp_mflags} -C progs
-make %{?_smp_mflags} -C tack
 
 cd ../widec
 ln -s ../configure .
@@ -83,8 +87,8 @@ cd ..
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make -C narrowc install.{libs,progs,tack,data}
-make -C widec install.{libs,includes,man}
+make -C narrowc DESTDIR=$RPM_BUILD_ROOT install.{libs,progs,data}
+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
@@ -136,7 +140,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 
 %files
 %defattr(-,root,root)
-%doc README ANNOUNCE doc/html/announce.html
+%doc ANNOUNCE AUTHORS README TO-DO
 /%{_lib}/libncurses*.so.*
 %{_libdir}/lib*.so.*
 %dir %{_sysconfdir}/terminfo
@@ -176,6 +180,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Feb 06 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-3.20070203
+- update to patch 20070203
+- spec cleanup (#226188)
+
 * Sun Jan 21 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-2.20070120
 - update to patch 20070120
 - don't depend on bash, drop resetall script
@@ -542,24 +550,24 @@ rm -rf ${RPM_BUILD_ROOT}
 - xterm terminfo entries from XFree86 3.3.6
 - final round of xterm fixes, follow debian policy.
 
-* Sat Feb  5 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Sat Feb  5 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - strip libraries
 
-* Thu Feb  3 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Thu Feb  3 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - More xterm fixes (Bug #9087)
 
-* Thu Jan 27 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Thu Jan 27 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - More xterm fixes from Hans de Goede (Bug #8633)
 
-* Sat Jan 15 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Sat Jan 15 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - remove some broken symlinks (leftovers from libncurses.so.5)
 - Use %%configure (Bug #8484)
 
-* Tue Jan 11 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Tue Jan 11 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Add xterm patch from Hans de Goede <hans@highrise.nl>
 - Patch 20000108, this fixes a problem with a header file.
 
-* Wed Jan  5 2000 Bernhard Rosenkränzer <bero@redhat.com>
+* Wed Jan  5 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Add 20000101 patch, hopefully finally fixing the xterm description
 
 * Wed Dec 22 1999 Cristian Gafton <gafton@redhat.com>
diff --git a/sources b/sources
index 8a89e7e..540bc71 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
 f66addc615259d75eaf2b7143246f516  ncurses-5.6-20061223-20070120.patch.bz2
+e38f33a9da9b3010d1ab5d22a5325b36  ncurses-5.6-20070127-20070203.patch.bz2