diff --git a/gpm.spec b/gpm.spec
index f7be074..47a853a 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,7 +1,7 @@
-Summary: A mouse server for the Linux console.
+Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://unix.schottelius.org/gpm/
@@ -13,12 +13,13 @@ Patch2: gpm-1.20.1-lib-silent.patch
 Patch3: gpm-1.20.3-gcc4.3.patch
 Patch4: gpm-1.20.5-close-fds.patch
 Patch5: gpm-1.20.1-weak-wgetch.patch
-Patch6: gpm-1.20.5-ac_package_version.patch
-Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
-Requires: bash >= 2.0
+Patch6: gpm-1.20.5-ac_package_version.patch 
+Requires(post): /sbin/chkconfig /sbin/install-info /sbin/ldconfig 
+Requires(preun): /sbin/chkconfig /sbin/install-info
+Requires(postun): /sbin/ldconfig 
 # this defines the library version that this package builds.
 %define LIBVER 2.1.0
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 BuildRequires: sed gawk texinfo bison ncurses-devel autoconf
 
 %description
@@ -30,15 +31,22 @@ mouse button.
 
 %package devel
 Requires: %{name} = %{version}-%{release}
-Summary: A mouse server for the Linux console.
-Group: System Environment/Daemons
+Summary: Development files for the gpm library
+Group: Development/Libraries
 
 %description devel
-Gpm provides mouse support to text-based Linux applications like the
-Emacs editor and the Midnight Commander file management system.  Gpm
-also provides console cut-and-paste operations using the mouse and
-includes a program to allow pop-up menus to appear at the click of a
-mouse button.
+The gpm-devel package includes header files and libraries necessary
+for developing programs which use the gpm library. The gpm provides
+mouse support to text-based Linux applications.
+
+%package static
+Requires: %{name} = %{version}-%{release}
+Summary: Static development files for the gpm library
+Group: Development/Libraries
+
+%description static
+The gpm-static package includes static libraries of gpm. The gpm provides
+mouse support to text-based Linux applications.
 
 
 %prep
@@ -50,14 +58,17 @@ mouse button.
 %patch5 -p1 -b .weak-wgetch
 %patch6 -p1 -b .ac_package_version
 
-%build
+iconv -f iso-8859-1 -t utf-8 -o TODO.utf8 TODO
+mv -f TODO.utf8 TODO
+
 rm -f configure
 rm -f src/prog/open_console.o
 autoconf
-CFLAGS="-D_GNU_SOURCE $RPM_OPT_FLAGS" \
-    %configure
-make
-gcc $RPM_OPT_FLAGS -o inputattach %{SOURCE2}
+
+%build
+%configure
+make %{?_smp_mflags}
+gcc %{?_smp_mflags} -o inputattach %{SOURCE2}
 
 
 %install
@@ -65,10 +76,11 @@ rm -rf %{buildroot}
 
 %makeinstall
 
-ln -sf libgpm.so.%{LIBVER} $RPM_BUILD_ROOT/%{_libdir}/libgpm.so
+chmod 0755 %{buildroot}/%{_libdir}/libgpm.so.%{LIBVER}
+ln -sf libgpm.so.%{LIBVER} %{buildroot}/%{_libdir}/libgpm.so
+
 
 %ifnarch s390 s390x
-mkdir -p %{buildroot}%{_sysconfdir}
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d  
 install -m 755 inputattach %{buildroot}%{_sbindir}
 install -m 644 conf/gpm-* %{buildroot}%{_sysconfdir}
@@ -84,32 +96,30 @@ rm -rf %{buildroot}%{_mandir}
 %clean
 rm -rf %{buildroot}
 
-%post
+%post -p /sbin/ldconfig
 %ifnarch s390 s390x
 /sbin/chkconfig --add gpm
 %endif
 /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir
-/sbin/ldconfig
 
 %preun
 %ifnarch s390 s390x   
-if [ "$1" = "0" ]; then
+if [ $1 -eq 0 ]; then
     /sbin/service gpm stop >/dev/null 2>&1
     /sbin/chkconfig --del gpm
 fi
 %endif
 /sbin/install-info %{_infodir}/gpm.info.gz --delete %{_infodir}/dir
 
-%postun
+%postun -p /sbin/ldconfig
 %ifnarch s390 s390x
-if [ "$1" -ge "1" ]; then
+if [ $1 -ge 1 ]; then
     /sbin/service gpm condrestart >/dev/null 2>&1
 fi
 %endif
-/sbin/ldconfig
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc BUGS COPYING README TODO
 %doc doc/README* doc/FAQ doc/Announce doc/changes/*
 %{_infodir}/*
@@ -119,16 +129,22 @@ fi
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/gpm
 %{_sbindir}/*
 %{_bindir}/*
-%{_mandir}/*/*
+%{_mandir}/man?/*
 %endif
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/*
-%{_libdir}/libgpm.a
 %{_libdir}/libgpm.so
 
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libgpm.a
+
 %changelog
+* Tue Feb 03 2009 Zdenek Prikryl <zprikryl@redhat.com> - 1.20.5-3
+- Spec review (#225856)
+
 * Wed Dec 02 2008 Zdenek Prikryl <zprikryl@redhat.com> - 1.20.5-2
 - Fixed debug mode (#473422)
 - Fixed description in init script (#474337)
@@ -456,7 +472,7 @@ fi
 - prereq initscripts >= 5.20
 
 * Sat Jun 17 2000 Bill Nottingham <notting@redhat.com>
-- fix %config tag for initscript
+- fix %%config tag for initscript
 
 * Thu Jun 15 2000 Bill Nottingham <notting@redhat.com>
 - move it back
@@ -515,7 +531,7 @@ fi
 - install-info sucks, and then you die.
 
 * Fri Sep 10 1999 Bill Nottingham <notting@redhat.com>
-- chkconfig --del in %preun, not %postun
+- chkconfig --del in %%preun, not %%postun
 
 * Fri Aug 27 1999 Preston Brown <pbrown@redhat.com>
 - upgrade to 1.17.9