diff --git a/.cvsignore b/.cvsignore
index e41c187..fcebbf7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-ncurses-5.1-20000730.patch.bz2
+ncurses-5.1-20000930.patch.bz2
+ncurses-5.1-20001007.patch.gz
 ncurses-5.1.tar.gz
diff --git a/ncurses.spec b/ncurses.spec
index d45a92c..f90d3e0 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,8 +1,8 @@
 Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.1
-%define PATCHDATE 20000730
-Release: 2j1
+%define PATCHDATE 20000930
+Release: 5
 Copyright: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -11,9 +11,9 @@ Source2: ncurses-linux
 Source3: ncurses-linux-m
 Source4: ncurses-resetall.sh
 Patch1: ftp://dickey.his.com/ncurses/%{version}/ncurses-%{version}-%{PATCHDATE}.patch.bz2
+Patch2: ncurses-5.1-20001007.patch.gz
 Patch12: ncurses-5.0-setuid2.patch
-Patch13: ncurses-5.0-xtermchanges.patch
-Patch100: ncurses-5.1-kterm.patch
+Patch13: ncurses-5.1-xtermchanges.patch
 BuildRoot: /var/tmp/%{name}-root
 
 %description
@@ -37,9 +37,9 @@ which will use ncurses.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch12 -p1
 %patch13 -p1 -b .xtermchanges
-%patch100 -p1 -b .kterm
 find . -name "*.orig" -exec rm -f {} \;
 
 %build
@@ -52,7 +52,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall includedir=$RPM_BUILD_ROOT/usr/include/ncurses
+%makeinstall includedir=$RPM_BUILD_ROOT/usr/include/ncurses ticdir=$RPM_BUILD_ROOT/usr/share/terminfo
 ln -s ../l/linux $RPM_BUILD_ROOT/usr/share/terminfo/c/console
 ln -s ncurses/curses.h $RPM_BUILD_ROOT/usr/include/ncurses.h
 for I in curses unctrl eti form menu panel term; do
@@ -77,7 +77,7 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall
 
 %files
 %defattr(-,root,root)
-%doc README ANNOUNCE
+%doc README ANNOUNCE doc/html/announce.html
 %attr(755,root,root) /usr/lib/lib*.so.*
 %{_datadir}/terminfo
 %{_datadir}/tabset
@@ -89,8 +89,8 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall
 %files devel
 %defattr(-,root,root)
 %doc c++ test
-%doc misc/hackguide.html
-%doc misc/ncurses-intro.html
+%doc doc/html/hackguide.html
+%doc doc/html/ncurses-intro.html
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
 %{_includedir}/*
@@ -100,8 +100,11 @@ install -c -m 755 %{SOURCE4} $RPM_BUILD_ROOT/usr/bin/resetall
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Sep  4 2000 ISHIKAWA Mutsumi <ishikawa@redhat.com>
-- update kterm terminfo from Vine
+* Mon Oct  9 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- Update (fixes the "make menuconfig" bug introduced by the security fix)
+
+* Tue Oct  3 2000 Bernhard Rosenkraenzer <bero@redhat.com>
+- Fix security problem (possible buffer overrun)
 
 * Fri Aug  4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - Add the bugfix patches from the ncurses maintainer
diff --git a/sources b/sources
index 40fe4dd..7f0c0d5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-2eee0fe30194030018c40fd4a39c8405  ncurses-5.1-20000730.patch.bz2
+5abaef6dfca0844a94f6c4930179f680  ncurses-5.1-20000930.patch.bz2
+0a930f2330b2ede956e42dc396a14964  ncurses-5.1-20001007.patch.gz
 6b379ee0b8ad607acdba9c8039818921  ncurses-5.1.tar.gz