diff --git a/ncurses.spec b/ncurses.spec
index 1ab11e8..ff0373a 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -2,15 +2,18 @@ Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.4
 %define includedirw %{_includedir}/ncursesw
-Release: 10.fc3
+Release: 11.fc3
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
 Source0: ftp://dickey.his.com/ncurses/ncurses-%{version}.tar.bz2
+Source1: patch-5.4-20040711.sh
 Source2: ncurses-linux
 Source3: ncurses-linux-m
 Source4: ncurses-resetall.sh
-Patch13: ncurses-5.4-home_end.patch 
+Source5: term.sh
+Patch1: ncurses-5.4-20040718.patch
+Patch2: ncurses-5.4-20040724.patch
 BuildRequires: sharutils
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -43,7 +46,11 @@ Use the following compiler flags to build against the ncurses library:
 
 %prep
 %setup -q
-%patch13 -p1 -b .home_end
+
+/bin/bash %{SOURCE1}
+
+%patch1  -p1 -b .20040718
+%patch2  -p1 -b .20040724
 
 %build
 CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES"
@@ -97,7 +104,9 @@ install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux
 install -c -m644 %SOURCE3 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m
 %endif
 
-install -c -m 755 %SOURCE4 ${RPM_BUILD_ROOT}%{_bindir}/resetall
+install -c -m 755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_bindir}/resetall
+install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
+install -c -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d
 
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/key_defined.3x.20030517*
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
@@ -113,6 +122,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
 %{_datadir}/terminfo
 %{_datadir}/tabset
 %{_libdir}/lib*.so
+%{_sysconfdir}/profile.d/term.sh
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -144,6 +154,13 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/man/man2/panel.3x.20030517*
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Thu Jul 29 2004 Adrian Havill <havill@redhat.com> 5.4-11
+- add latest rollup patches and weekly patches
+- remove home/end patch, which is now included in latest
+  terminfo.src and termcap.src
+- add term.sh to /etc/profile.d, reference in /etc/bashrc
+- modify term.sh to support rxvt (#122815 comment 93)
+
 * Fri Jul 08 2004 Adrian Havill <havill@redhat.com> 5.4-10
 - add home/end mappings to gnome definition (#122815)