diff --git a/.cvsignore b/.cvsignore
index dea0423..0ddf209 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 ncurses-5.6.tar.gz
 ncurses-5.6-20070303-patch.sh.bz2
+ncurses-5.6-20070303-20070612.patch.bz2
diff --git a/ncurses-5.5-20061209-tgetent.patch b/ncurses-5.5-20061209-tgetent.patch
deleted file mode 100644
index a72be3d..0000000
--- a/ncurses-5.5-20061209-tgetent.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ncurses-5.5/ncurses/tinfo/lib_termcap.c.tgetent	2006-12-07 13:07:03.000000000 +0100
-+++ ncurses-5.5/ncurses/tinfo/lib_termcap.c	2006-12-07 13:07:04.000000000 +0100
-@@ -135,6 +135,7 @@
-     }
-     LAST_TRM = cur_term;
-     LAST_SEQ = ++sequence;
-+    LAST_BUF = 0;
- 
-     PC = 0;
-     UP = 0;
diff --git a/ncurses-5.6-20070612-libs.patch b/ncurses-5.6-20070612-libs.patch
new file mode 100644
index 0000000..86aa310
--- /dev/null
+++ b/ncurses-5.6-20070612-libs.patch
@@ -0,0 +1,33 @@
+--- ncurses-5.6/menu/Makefile.in.libs	2007-06-13 15:01:12.000000000 +0200
++++ ncurses-5.6/menu/Makefile.in	2007-06-13 15:01:13.000000000 +0200
+@@ -95,7 +95,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
++SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@
+ 
+--- ncurses-5.6/panel/Makefile.in.libs	2007-06-13 15:01:12.000000000 +0200
++++ ncurses-5.6/panel/Makefile.in	2007-06-13 15:01:13.000000000 +0200
+@@ -96,7 +96,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
++SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@
+ 
+--- ncurses-5.6/form/Makefile.in.libs	2007-06-13 15:01:12.000000000 +0200
++++ ncurses-5.6/form/Makefile.in	2007-06-13 15:01:13.000000000 +0200
+@@ -95,7 +95,7 @@ LINK		= $(LIBTOOL_LINK)
+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
+ 
+ SHLIB_DIRS	= -L../lib
+-SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
++SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ #@SHLIB_LIST@
+ 
+ MK_SHARED_LIB	= @MK_SHARED_LIB@
+ 
diff --git a/ncurses.spec b/ncurses.spec
index 7839a6b..0a06114 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,16 +1,17 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.6
-Release: 6.20070303%{?dist}
+Release: 7.20070612%{?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-20070303-patch.sh.bz2
+Patch2: ncurses-5.6-20070303-20070612.patch.bz2
 
-Patch6: ncurses-5.5-20061209-tgetent.patch
 Patch8: ncurses-5.5-20061209-config.patch
+Patch9: ncurses-5.6-20070612-libs.patch
 Patch10: ncurses-5.5-20061209-xterm.patch
 Patch11: ncurses-5.6-20070120-urxvt.patch
 BuildRequires: gpm-devel
@@ -48,9 +49,10 @@ The ncurses-static package includes static libraries of the ncurses library.
 %patch1 -p1
 # tack isn't in ncurses tree since 20070203
 rm -rf tack
+%patch2 -p1
 
-%patch6 -p1 -b .tgetent
 %patch8 -p1 -b .config
+%patch9 -p1 -b .libs
 %patch10 -p1 -b .xterm
 %patch11 -p1 -b .urxvt
 
@@ -182,6 +184,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Wed Jun 13 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-7.20070612
+- update to patch 20070612
+
 * Thu Mar 08 2007 Miroslav Lichvar <mlichvar@redhat.com> 5.6-6.20070303
 - update to patch 20070303
 - use one libtinfo for both libncurses and libncursesw
diff --git a/sources b/sources
index 35d86de..0da580a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 b6593abe1089d6aab1551c105c9300e3  ncurses-5.6.tar.gz
 8d3f8d5a55baa9b1feb163d152ce67f8  ncurses-5.6-20070303-patch.sh.bz2
+dfadd4cebb8774744932b449f3f4c23c  ncurses-5.6-20070303-20070612.patch.bz2