diff --git a/ncurses.spec b/ncurses.spec
index 59e0b52..b0978d2 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: A terminal handling library
 Name: ncurses
 Version: 5.5
-Release: 24.20060715
+Release: 25.20060715%{?dist}
 License: distributable
 Group: System Environment/Libraries
 URL: http://invisible-island.net/ncurses/ncurses.html
@@ -17,6 +17,7 @@ Patch5: ncurses-5.4-xterm-kbs.patch
 Patch6: ncurses-5.5-20060715-tgetent.patch
 Patch7: ncurses-5.5-20060715-tgetstr.patch
 Patch8: ncurses-5.5-20060715-cflags.patch
+Patch9: ncurses-5.5-liblinks.patch
 BuildRequires: sharutils gpm-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,7 +30,7 @@ discontinued 4.4 BSD classic curses library.
 %package devel
 Summary: Development files for the ncurses library
 Group: Development/Libraries
-Requires: ncurses = %{PACKAGE_VERSION}
+Requires: %{name} = %{version}-%{release}
 Obsoletes: ncurses-c++-devel
 
 %description devel
@@ -58,26 +59,30 @@ zcat %{SOURCE4} | sh > /dev/null
 %patch6 -p1 -b .tgetent
 %patch7 -p1 -b .tgetstr
 %patch8 -p1 -b .cflags
+%patch9 -p1 -b .liblinks
 
 %build
+%define rootdatadir /lib
+%define ncurses_options \\\
+    --with-shared --without-ada --with-ospeed=unsigned \\\
+    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \\\
+    --with-install-prefix=$RPM_BUILD_ROOT \\\
+    --with-terminfo-dirs=%{_datadir}/terminfo:%{rootdatadir}/terminfo \\\
+    --enable-overwrite \\\
+    --with-chtype=long
+
 mkdir narrowc widec
 cd narrowc
 ln -s ../configure .
-%configure \
-    --with-shared --without-ada --with-ospeed=unsigned \
-    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \
-    --with-install-prefix=${RPM_BUILD_ROOT} \
-    --includedir=%{_includedir}/ncurses \
-    --with-chtype=long
+%configure %{ncurses_options} \
+    --includedir=%{_includedir}/ncurses
 make %{?_smp_mflags}
+
 cd ../widec
 ln -s ../configure .
-%configure --enable-widec \
-    --with-shared --without-ada --with-ospeed=unsigned \
-    --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \
-    --with-install-prefix=${RPM_BUILD_ROOT} \
-    --includedir=%{_includedir}/ncursesw \
-    --with-chtype=long
+%configure %{ncurses_options} \
+    --enable-widec \
+    --includedir=%{_includedir}/ncursesw
 make %{?_smp_mflags}
 cd ..
 
@@ -90,19 +95,30 @@ make -C widec install
 chmod 755 ${RPM_BUILD_ROOT}%{_libdir}/lib*.so.*.*
 chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/lib*.a
 
-ln -s ../l/linux ${RPM_BUILD_ROOT}%{_datadir}/terminfo/c/console
+# move libncurses.so.* to /lib*
+mkdir $RPM_BUILD_ROOT/%{_lib}
+mv $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
+for l in $RPM_BUILD_ROOT%{_libdir}/libncurses.so; do
+    ln -sf $(echo %{_libdir} | \
+        sed 's,\(^/\|\)[^/][^/]*,..,g')/%{_lib}/$(readlink $l) $l
+done
+
+# move few basic terminfo entries to /lib
+mkdir -p $RPM_BUILD_ROOT%{rootdatadir}/terminfo
+for termname in \
+        ansi dumb linux vt100 vt100-nav vt220 xterm
+do
+    termpath=terminfo/${termname::1}/$termname
+    mkdir $RPM_BUILD_ROOT%{rootdatadir}/terminfo/${termname::1} || : &> /dev/null
+    mv $RPM_BUILD_ROOT%{_datadir}/$termpath $RPM_BUILD_ROOT/%{rootdatadir}/$termpath
+    ln -s $(dirname %{_datadir}/$termpath | \
+        sed 's,\(^/\|\)[^/][^/]*,..,g')%{rootdatadir}/$termpath \
+        $RPM_BUILD_ROOT%{_datadir}/$termpath
+done
 
 ln -sf ncurses/{curses,unctrl,eti,form,menu,ncurses,panel,term}.h \
     ${RPM_BUILD_ROOT}%{_includedir}
 
-ln -sf libncurses.a ${RPM_BUILD_ROOT}%{_libdir}/libcurses.a
-ln -sf libncursesw.a ${RPM_BUILD_ROOT}%{_libdir}/libcursesw.a
-
-%ifarch sparc
-install -c -m644 %SOURCE1 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux
-install -c -m644 %SOURCE2 ${RPM_BUILD_ROOT}%{_datadir}/terminfo/l/linux-m
-%endif
-
 install -c -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/resetall
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
@@ -114,7 +130,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 %files
 %defattr(-,root,root)
 %doc README ANNOUNCE doc/html/announce.html
+/%{_lib}/libncurses*.so.*
 %{_libdir}/lib*.so.*
+%{rootdatadir}/terminfo
 %{_datadir}/terminfo
 %{_datadir}/tabset
 %{_bindir}/*
@@ -149,6 +167,10 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Mon Nov 27 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-25.20060715
+- move libncurses and some terminfo entries out of /usr
+- drop console symlink and sparc terminfo entries
+
 * Thu Aug 31 2006 Miroslav Lichvar <mlichvar@redhat.com> 5.5-24.20060715
 - modify tgetstr to make screen happy (#202480)
 - use CFLAGS when linking (#199369)