diff --git a/ncurses.spec b/ncurses.spec
index 0a4dff9..52fafda 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -2,7 +2,7 @@ Summary: A CRT screen handling and optimization package.
 Name: ncurses
 Version: 5.5
 %define includedirw %{_includedir}/ncursesw
-Release: 17
+Release: 18
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -14,7 +14,6 @@ Source3: ncurses-resetall.sh
 Patch1: ncurses-5.4-xterm-kbs.patch
 Patch2: ncurses-5.4-filter.patch
 Patch3: ncurses-5.4-endwinfilter.patch
-Patch4: ncurses-5.5-chtypeaslong3.patch
 BuildRequires: sharutils
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -52,7 +51,6 @@ Use the following compiler flags to build against the ncurses library:
 %patch1 -p1 -b .xterm-kbs
 %patch2 -p1 -b .filter
 %patch3 -p1 -b .endwinfilter
-%patch4 -p1 -b .chtypeaslong3
 
 %build
 CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES"
@@ -67,14 +65,16 @@ ln -s ../configure .
 %configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \
    $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \
    --enable-colorfgbg $WITHOUT_XTERM_NEW \
-   --with-install-prefix=${RPM_BUILD_ROOT}
+   --with-install-prefix=${RPM_BUILD_ROOT} \
+   --with-chtype=long
 make
 cd ../widec
 ln -s ../configure .
 %configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \
    $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \
    --enable-colorfgbg $WITHOUT_XTERM_NEW --enable-widec \
-   --with-install-prefix=${RPM_BUILD_ROOT}
+   --with-install-prefix=${RPM_BUILD_ROOT} \
+   --with-chtype=long
 make
 cd ..
 
@@ -165,24 +165,13 @@ rm -Rf ${RPM_BUILD_ROOT}%{_libdir}/terminfo
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Fri Jan 31 2006 Jindrich Novy <jnovy@redhat.com> 5.5-18
+- add --with-chtype=long to avoid type clashes on x86_64 (#178824)
+- spec cleanup
+
 * Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-17
 - Rebuild.
 
-* Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-16
-- Rebuild.
-
-* Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-15
-- Rebuild.
-
-* Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-14
-- Rebuild.
-
-* Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-13
-- Rebuild.
-
-* Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-12
-- Rebuild.
-
 * Fri Jan 27 2006 Petr Raszyk <praszyk@redhat.com> 5.5-11
 - According Henrik Nordstrom (hno@squid-cache.org)
   Diff between the two versions of curses.h on x86_64
@@ -198,24 +187,6 @@ rm -rf ${RPM_BUILD_ROOT}
 * Thu Dec 22 2005 Petr Raszyk <praszyk@redhat.com> 5.5-8
 - Strip *.so libs.
 
-* Thu Dec 22 2005 Petr Raszyk <praszyk@redhat.com> 5.5-7
-- Strip *.so libs.
-
-* Thu Dec 22 2005 Petr Raszyk <praszyk@redhat.com> 5.5-6
-- Strip *.so libs.
-
-* Thu Dec 22 2005 Petr Raszyk <praszyk@redhat.com> 5.5-5
-- Strip *.so libs.
-
-* Thu Dec 22 2005 Petr Raszyk <praszyk@redhat.com> 5.5-4
-- Strip *.so libs.
-
-* Wed Dec 21 2005 Petr Raszyk <praszyk@redhat.com> 5.5-3
-- Rebuild.
-
-* Wed Dec 21 2005 Petr Raszyk <praszyk@redhat.com> 5.5-2
-- Rebuild.
-
 * Wed Dec 21 2005 Petr Raszyk <praszyk@redhat.com> 5.5-1
 - Upgrade to ncurses 5.5