diff --git a/oath-toolkit.changes b/oath-toolkit.changes
index 4b590f1..66d18f7 100644
--- a/oath-toolkit.changes
+++ b/oath-toolkit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 11 18:14:17 UTC 2014 - darin@darins.net
+
+- Ran through spec-cleaner 
+
 -------------------------------------------------------------------
 Wed Oct 23 09:41:19 UTC 2013 - vuntz@opensuse.org
 
diff --git a/oath-toolkit.spec b/oath-toolkit.spec
index efce700..11244d9 100644
--- a/oath-toolkit.spec
+++ b/oath-toolkit.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package
+# spec file for package oath-toolkit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,17 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define build_pskc 0
-
 Name:           oath-toolkit
 Version:        2.4.0
 Release:        0
-License:        GPL-3.0+
 Summary:        Toolkit for one-time password authentication systems
-Url:            http://www.nongnu.org/oath-toolkit/
+License:        GPL-3.0+
 Group:          Productivity/Networking/Security
+Url:            http://www.nongnu.org/oath-toolkit/
 Source:         http://download.savannah.nongnu.org/releases/oath-toolkit/oath-toolkit-%{version}.tar.gz
 BuildRequires:  bison
 BuildRequires:  gengetopt
@@ -33,11 +31,11 @@ BuildRequires:  gtk-doc
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pam-devel
 BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{build_pskc}
 BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig(xmlsec1)
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The OATH Toolkit makes it easy to build one-time password
@@ -79,13 +77,12 @@ organization that specify the algorithms. For managing secret key
 files, the Portable Symmetric Key Container (PSKC) format described in
 RFC6030 is supported.
 
-
 %package -n     liboath-devel
 Summary:        Library for Open AuTHentication (OATH) HOTP support -- Development Files
 License:        LGPL-2.1+
 Group:          Productivity/Networking/Security
-Requires:       liboath0 = %{version}
 Requires:       glibc-devel
+Requires:       liboath0 = %{version}
 
 %description -n liboath-devel
 The OATH Toolkit makes it easy to build one-time password
@@ -98,6 +95,7 @@ files, the Portable Symmetric Key Container (PSKC) format described in
 RFC6030 is supported.
 
 %if %{build_pskc}
+
 %package -n     libpskc0
 Summary:        Library for Portable Symmetric Key Container
 License:        LGPL-2.1+
@@ -113,13 +111,12 @@ organization that specify the algorithms. For managing secret key
 files, the Portable Symmetric Key Container (PSKC) format described in
 RFC6030 is supported.
 
-
 %package -n     libpskc-devel
 Summary:        Library for Portable Symmetric Key Container -- Development Files
 License:        LGPL-2.1+
 Group:          Productivity/Networking/Security
-Requires:       libpskc0 = %{version}
 Requires:       glibc-devel
+Requires:       libpskc0 = %{version}
 
 %description -n libpskc-devel
 The OATH Toolkit makes it easy to build one-time password
@@ -145,18 +142,17 @@ RFC6030 is supported.
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 mv COPYING COPYING.summary
-find %{buildroot} -type f -name "*.la" -print -delete
+find %{buildroot} -type f -name "*.la" -delete -print
 
-%clean
-%__rm -rf %{buildroot}
 
 %post -n liboath0 -p /sbin/ldconfig
 
 %postun -n liboath0 -p /sbin/ldconfig
 
 %if %{build_pskc}
+
 %post -n libpskc0 -p /sbin/ldconfig
 
 %postun -n libpskc0 -p /sbin/ldconfig
@@ -191,6 +187,7 @@ find %{buildroot} -type f -name "*.la" -print -delete
 %{_mandir}/man3/oath_*
 
 %if %{build_pskc}
+
 %files -n libpskc0
 %defattr(-,root,root)
 # there's no COPYING for libpskc, but it's LGPL, like liboath