diff --git a/hostap-utils.changes b/hostap-utils.changes
index 92bd348..9de960b 100644
--- a/hostap-utils.changes
+++ b/hostap-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul 12 16:08:35 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Oct  8 13:15:53 UTC 2014 - jengelh@inai.de
 
diff --git a/hostap-utils.spec b/hostap-utils.spec
index 684173d..941c71e 100644
--- a/hostap-utils.spec
+++ b/hostap-utils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hostap-utils
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,28 +23,22 @@ Summary:        Tools for Prism2 cards
 License:        GPL-2.0+
 Group:          Hardware/Wifi
 Url:            http://hostap.epitest.fi/
-Source:         http://w1.fi/releases/%name-%version.tar.gz
-Patch:          hostap-utils.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source:         http://w1.fi/releases/%{name}-%{version}.tar.gz
+Patch0:         hostap-utils.diff
 BuildRequires:  openssl-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This package contains various tools for configuring Prism2 cards driven
 by the HostAP kernel module. In particular, it contains a utility to
 query and flash firmware of Prism2 adapters.
 
-
-
-Authors:
---------
-    Jouni Malinen <jkmaline@cc.hut.fi>
-
 %prep
-%setup
-%patch -p1
+%setup -q
+%patch0 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" make %{?_smp_mflags}
+CFLAGS="%{optflags}" CC="gcc" make %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}/%{_sbindir}