diff --git a/atmel-firmware.changes b/atmel-firmware.changes
index 177a1c2..b713af5 100644
--- a/atmel-firmware.changes
+++ b/atmel-firmware.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 27 18:28:16 CEST 2009 - lrupp@suse.de
+
+- specfile cleanup
+
 -------------------------------------------------------------------
 Fri Mar 16 15:18:41 CET 2007 - jg@suse.de
 
diff --git a/atmel-firmware.spec b/atmel-firmware.spec
index eb9dbc3..f54a941 100644
--- a/atmel-firmware.spec
+++ b/atmel-firmware.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package atmel-firmware (Version 1.3)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,14 +19,14 @@
 
 
 Name:           atmel-firmware
+Summary:        Firmware for Atmel at76c50x Wireless Network Chips
 Version:        1.3
-Release:        140
-License:        GPL v2 or later; Distributable in unmodified form
+Release:        141
+License:        GPLv2+ ; NON-OSI-COMPLIANT(no modification)
 Group:          Hardware/Wifi
 Url:            http://www.thekelleys.org.uk/atmel
 Source0:        atmel-firmware-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary:        Firmware for Atmel at76c50x Wireless Network Chips
 BuildArch:      noarch
 # Modules: at76c503-i3861.ko at76c503-i3863.ko at76c503.ko
 #	   at76c503-rfmd-acc.ko at76c503-rfmd.ko at76c505a-rfmd2958.ko
@@ -70,14 +70,13 @@ Supplements:    modalias(usb:v8086p0200d*dc*dsc*dp*ic*isc*ip*)
 # Generated with: extract-modaliases wlan-kmp-default.rpm
 
 %description
-The drivers for Atmel at76c50x wireless network chips in the Linux
-2.6.x kernel and at http://at76c503a.berlios.de/ do not include the
-firmware and this firmware needs to be loaded by the host on most cards
-using these chips. This package provides the firmware images that
-should be automatically loaded as needed by the hotplug system. It also
-provides a small loader utility that can be used to accomplish the same
-thing when hotplug is not in use.
+The drivers for Atmel at76c50x wireless network chips in the Linux 2.6.x kernel
+and at http://at76c503a.berlios.de/ do not include the firmware and this
+firmware needs to be loaded by the host on most cards using these chips. 
 
+This package provides the firmware images that should be automatically loaded
+as needed by the hotplug system. It also provides a small loader utility that
+can be used to accomplish the same thing when hotplug is not in use.
 
 
 Authors:
@@ -91,15 +90,11 @@ Authors:
 %build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/sbin
-mkdir -p -m 755 $RPM_BUILD_ROOT/lib/firmware
-mkdir -p -m 755 $RPM_BUILD_ROOT/usr/share/man/man8
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pcmcia
-cp images/* $RPM_BUILD_ROOT/lib/firmware
-cp images.usb/* $RPM_BUILD_ROOT/lib/firmware
-install -m755 atmel_fwl.pl $RPM_BUILD_ROOT/usr/sbin/atmel_fwl
-install -m644 atmel_fwl.8 $RPM_BUILD_ROOT/usr/share/man/man8
+mkdir -p -m 755 %{buildroot}/lib/firmware
+cp images/* %{buildroot}/lib/firmware/
+cp images.usb/* %{buildroot}/lib/firmware/
+install -Dm755 atmel_fwl.pl %{buildroot}/%{_sbindir}/atmel_fwl
+install -Dm644 atmel_fwl.8  %{buildroot}/%{_mandir}/man8/atmel_fwl.8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,31 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README COPYING 
-%attr(0755,root,root) /usr/sbin/atmel_fwl
-%attr(0644,root,root) /usr/share/man/man8/atmel_fwl.8.gz
+%{_sbindir}/atmel_fwl
+%{_mandir}/man8/atmel_fwl.8.gz
 /lib/firmware/*
 
 %changelog
-* Fri Mar 16 2007 jg@suse.de
-- removed /lib/firmware from filelist
-* Wed Mar 08 2006 agruen@suse.de
-- Add modalias tags (155357).
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Wed Sep 28 2005 dmueller@suse.de
-- add norootforbuild
-* Fri Aug 19 2005 ro@suse.de
-- removed hotplug from nfb
-* Thu Aug 11 2005 jg@suse.de
-- update to version 1.3
-- removed obsolete cardmgr reload
-- made package noarch as atmel_fw tool is a perl script now
-* Mon Feb 28 2005 jg@suse.de
-- exiting postinstall script cleanly even when cardmgr died
-  (bug 66787)
-* Thu Jan 13 2005 jg@suse.de
-- update to version 1.1
-- moved firmware binaries from /usr/lib/hotplug/firmware to
-  /lib/firmware
-* Mon May 24 2004 jg@suse.de
-- Initial SuSE package