diff --git a/.cvsignore b/.cvsignore
index a7cdc5c..5d8a3ed 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,3 @@
 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
-ncurses-5.6-20080308-20080524.patch.bz2
+ncurses-5.6-20080621-patch.sh.bz2
+ncurses-5.6-20080628.patch.gz
diff --git a/ncurses-5.6-20080112-xterm.patch b/ncurses-5.6-20080112-xterm.patch
index bce09a5..a0b96a7 100644
--- a/ncurses-5.6-20080112-xterm.patch
+++ b/ncurses-5.6-20080112-xterm.patch
@@ -1,14 +1,6 @@
 diff -up ncurses-5.6/misc/terminfo.src.xterm ncurses-5.6/misc/terminfo.src
 --- ncurses-5.6/misc/terminfo.src.xterm	2008-01-10 16:59:01.000000000 +0100
 +++ ncurses-5.6/misc/terminfo.src	2008-01-10 16:59:45.000000000 +0100
-@@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X
- # This version reflects the current xterm features.
- xterm-new|modern xterm terminal emulator,
- 	npc,
-+	kbs=\177,
- 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
- 	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
- 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
 @@ -3046,7 +3047,7 @@ xterm-new|modern xterm terminal emulator
  # The meta key may also be used as a modifier in this scheme, adding another
  # bit to the parameter.
diff --git a/ncurses-5.6-20080628-kbs.patch b/ncurses-5.6-20080628-kbs.patch
new file mode 100644
index 0000000..2f1913f
--- /dev/null
+++ b/ncurses-5.6-20080628-kbs.patch
@@ -0,0 +1,53 @@
+diff -up ncurses-5.6/misc/terminfo.src.kbs ncurses-5.6/misc/terminfo.src
+--- ncurses-5.6/misc/terminfo.src.kbs	2008-07-04 14:20:05.000000000 +0200
++++ ncurses-5.6/misc/terminfo.src	2008-07-04 14:34:12.000000000 +0200
+@@ -3023,6 +3023,7 @@ xterm-xfree86|xterm terminal emulator (X
+ # This version reflects the current xterm features.
+ xterm-new|modern xterm terminal emulator,
+ 	npc,
++	kbs=\177,
+ 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
+ 	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
+ 	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+@@ -3740,6 +3741,7 @@ mlterm+pcfkeys|fragment for PC-style fke
+ rxvt-basic|rxvt terminal base (X Window System),
+ 	OTbs, am, bce, eo, mir, msgr, xenl, xon,
+ 	cols#80, it#8, lines#24,
++	kbs=\177,
+ 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ 	clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
+@@ -3750,7 +3752,7 @@ rxvt-basic|rxvt terminal base (X Window 
+ 	enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H, ht=^I,
+ 	hts=\EH, ich=\E[%p1%d@, ich1=\E[@, il=\E[%p1%dL, il1=\E[L,
+ 	ind=^J, is1=\E[?47l\E=\E[?1l,
+-	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
++	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l,
+ 	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ 	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
+ 	rmul=\E[24m,
+@@ -4451,6 +4453,7 @@ eterm|gnu emacs term.el terminal emulati
+ screen|VT 100/ANSI X3.64 virtual terminal,
+ 	OTbs, OTpt, am, km, mir, msgr, xenl, G0,
+ 	colors#8, cols#80, it#8, lines#24, pairs#64,
++	kbs=\177,
+ 	acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+ 	clear=\E[H\E[J, cnorm=\E[34h\E[?25h, cr=^M,
+@@ -4460,7 +4463,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+ 	cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ 	dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+ 	flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+-	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z,
++	il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kcbt=\E[Z,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
+@@ -4565,6 +4568,7 @@ screen.xterm-r6|screen customized for X1
+ # on Solaris because Sun's curses implementation gets confused.
+ screen.teraterm|disable ncv in teraterm,
+ 	ncv#127,
++	kbs=^H,
+ 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
+ 	use=screen+fkeys, use=screen,
+ # Other terminals
diff --git a/ncurses.spec b/ncurses.spec
index 21de43f..44ffe6f 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,21 +1,20 @@
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 5.6
-Release: 17.20080524%{?dist}
+Release: 18.20080628%{?dist}
 License: MIT
 Group: System Environment/Base
 URL: http://invisible-island.net/ncurses/ncurses.html
 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
-Patch4: ncurses-5.6-20080308-20080524.patch.bz2
+Patch1: ncurses-5.6-20080621-patch.sh.bz2
+Patch2: ncurses-5.6-20080628.patch.gz
 
 Patch8: ncurses-5.5-20061209-config.patch
 Patch9: ncurses-5.6-20070612-libs.patch
 Patch10: ncurses-5.6-20080112-xterm.patch
 Patch11: ncurses-5.6-20080112-urxvt.patch
+Patch12: ncurses-5.6-20080628-kbs.patch
 BuildRequires: gpm-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -95,13 +94,12 @@ 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
-%patch4 -p1
 
 %patch8 -p1 -b .config
 %patch9 -p1 -b .libs
 %patch10 -p1 -b .xterm
 %patch11 -p1 -b .urxvt
+%patch12 -p1 -b .kbs
 
 # this will be in documentation, drop executable bits
 cp -p install-sh test
@@ -172,9 +170,9 @@ done
 
 # prepare -base and -term file lists
 for termname in \
-    Eterm cons25 cygwin gnome* hurd jfbterm mach* mrxvt nsterm \
-    putty* pcansi rxvt rxvt-\* screen screen-\* screen.linux screen.xterm* \
-    screen.rxvt sun teraterm wsvt25* xfce xterm xterm-\* xfce
+    Eterm cons25 cygwin gnome* hurd jfbterm mach* mlterm mrxvt \
+    nsterm putty* pcansi rxvt rxvt-\* screen screen-\* screen.* \
+    sun teraterm wsvt25* xfce xterm xterm-\*
 do
     for i in $RPM_BUILD_ROOT%{_datadir}/terminfo/?/$termname; do
         for t in $(find $RPM_BUILD_ROOT%{_datadir}/terminfo -samefile $i); do
@@ -258,6 +256,11 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Mon Jul 07 2008 Miroslav Lichvar <mlichvar@redhat.com> 5.6-18.20080628
+- update to patch 20080628
+- move mlterm and screen.* entries to -base
+- change kbs to ^? in rxvt and screen entries
+
 * Mon May 26 2008 Miroslav Lichvar <mlichvar@redhat.com> 5.6-17.20080524
 - update to patch 20080524
 - force installing wide libtinfo
diff --git a/sources b/sources
index cdf53d1..e462e55 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
 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
-41209f98c05d5b77c357f03c09164e60  ncurses-5.6-20080308-20080524.patch.bz2
+dacd429b696f41ff9c3fb5a886bb1baa  ncurses-5.6-20080621-patch.sh.bz2
+fa04d2137157416e6457e84234f2c6a6  ncurses-5.6-20080628.patch.gz