diff --git a/ncurses.spec b/ncurses.spec
index 5073a04..c571d8e 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -2,7 +2,7 @@ Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.4
 %define includedirw %{_includedir}/ncursesw
-Release: 5
+Release: 7
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -26,6 +26,7 @@ discontinued 4.4 BSD classic curses library.
 Summary: The development files for applications that use ncurses.
 Group: Development/Libraries
 Requires: ncurses = %{PACKAGE_VERSION}
+Obsoletes: ncurses-c++-devel
 
 %description devel
 The header files and libraries for developing applications that use
@@ -42,15 +43,6 @@ Use the following compiler flags to build against the ncurses library:
 -I %{includedirw} -lncursesw
 (compile and link against the wide-character, UTF-8, library)
 
-%package c++-devel
-Summary: C++ bindings to ncurses
-Group: System Environment/Libraries
-Requires: ncurses = %{PACKAGE_VERSION}
-Requires: ncurses-devel = %{PACKAGE_VERSION}
-
-%description c++-devel
-C++ bindings to ncurses
-
 %prep
 %setup -q
 %patch10 -p1 -b .color_xterm
@@ -133,8 +125,8 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
 %doc test
 %doc doc/html/hackguide.html
 %doc doc/html/ncurses-intro.html
+%doc c++/README*
 %{_libdir}/lib*.a
-
 %dir %{_includedir}/ncurses
 %dir %{_includedir}/ncursesw
 %{_includedir}/ncurses/*.h
@@ -149,20 +141,17 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
 %{_includedir}/unctrl.h
 %{_mandir}/man3/*
 
-%files c++-devel
-%defattr(-,root,root)
-%doc c++/NEWS c++/PROBLEMS c++/README*
-%{_includedir}/ncurses/cursesapp.h
-%{_includedir}/ncurses/curses?.h
-%{_includedir}/ncurses/etip.h
-%{_libdir}/libncurses++.a
-
-%{_libdir}/libncurses++w.a
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Sun May 30 2004 Florian La Roche <Florian.LaRoche@redhat.de>
+- remove ncurses-c++-devel rpm, all files are also part of ncurses-devel
+
+* Sat May 29 2004 Joe Orton <jorton@redhat.com> 5.4-6
+- fix xterm terminfo entry (Hans de Geode, #122815)
+
 * Thu May 06 2004 Adrian Havill <havill@redhat.com> 5.4-5
 - remove --with-gpm from configure, as it adds a pkg
   dependency (#122336) and causes too many problems vs its benefits