diff --git a/gpm.changes b/gpm.changes
index f646688..4859b9d 100644
--- a/gpm.changes
+++ b/gpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 10 10:41:10 UTC 2013 - jengelh@inai.de
+
+- Remove obsolete/undesired tags/sections
+- Use more robust make install call
+
 -------------------------------------------------------------------
 Sat Oct 15 04:47:11 UTC 2011 - coolo@suse.com
 
diff --git a/gpm.spec b/gpm.spec
index 19ee82e..968c0f5 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpm
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,25 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           gpm
-BuildRequires:  bison libtool lzma ncurses-devel
-Url:            http://linux.schottelius.org/gpm/
-License:        GPLv2+
-Group:          System/Console
-Provides:       select
-PreReq:         /bin/sed %insserv_prereq %fillup_prereq
-AutoReqProv:    on
-# bug437293
-%ifarch ppc64
-Obsoletes:      gpm-64bit
-%endif
-#
 Version:        1.20.6
-Release:        3
+Release:        0
 Summary:        Console Mouse Support
+License:        GPL-2.0+
+Group:          System/Console
+Url:            http://linux.schottelius.org/gpm/
+
 Source0:        gpm-%{version}.tar.lzma
 Source1:        gpm-%{version}-patches.tar.lzma
 Source2:        rcgpm
@@ -60,8 +50,18 @@ Patch23:        gpm-lib-silent.patch
 Patch24:        gpm-libtool.patch
 Patch25:        gpm-multilib.patch
 Patch26:        gpm-weak-wgetch.patch
+BuildRequires:  bison
+BuildRequires:  libtool
+BuildRequires:  lzma
+BuildRequires:  ncurses-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %install_info_prereq
+PreReq:         /bin/sed %insserv_prereq %fillup_prereq
+Provides:       select
+%ifarch ppc64
+# bug437293
+Obsoletes:      gpm-64bit
+%endif
 
 %description
 The gpm (general purpose mouse) daemon tries to be a useful mouse
@@ -69,18 +69,10 @@ server for applications running on the Linux console. It can be used by
 mc (Midnight Commander) or by w3m, the text-based Web browser. It
 provides console cut and paste operations.
 
-
-
-Authors:
---------
-    Alessandro Rubini <rubini at ipvvis.unipv.it>
-    Nico Schottelius <nico at schottelius.org>
-
 %package devel
-License:        GPLv2+
-Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Summary:        Development files for gpm (Console Mouse Support)
+Group:          Development/Libraries/C and C++
 
 %description devel
 Development files for the gpm (general purpose mouse) package.
@@ -120,7 +112,7 @@ make CC="%{__cc}" %{?_smp_mflags}
 %__cc %{optflags} -o inputattach %{SOURCE6}
 
 %install
-%makeinstall ROOT="" 
+make install DESTDIR="%buildroot" ROOT="" 
 #
 # gpm confings
 install -d $RPM_BUILD_ROOT/etc/${file/conf\/gpm-/gpm\/}
@@ -175,9 +167,6 @@ touch %{buildroot}%{_localstatedir}/run/gpm.pid
 %restart_on_update gpm
 %{insserv_cleanup}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc BUGS COPYING README README.SuSE TODO doc/changes