diff --git a/rt2860.changes b/rt2860.changes
index 1bb9855..fe06aad 100644
--- a/rt2860.changes
+++ b/rt2860.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 10 17:11:06 CET 2009 - meissner@suse.de
+
+- moved firmware to the right place bnc#554504
+
 -------------------------------------------------------------------
 Fri Nov  7 12:13:00 CET 2008 - meissner@suse.de
 
diff --git a/rt2860.spec b/rt2860.spec
index 5c7ca7f..982cf64 100644
--- a/rt2860.spec
+++ b/rt2860.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rt2860 (Version 1.8.0.0)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -21,10 +21,10 @@
 
 Name:           rt2860
 Version:        1.8.0.0
-Release:        2
+Release:        3
 Summary:        Userspace configuration files for rt2860 driver
 Group:          Hardware/Wifi
-License:        GPL v2 or later
+License:        GPLv2+
 Url:            http://www.ralinktech.com/ralink/Home/Support/Linux.html
 Source0:        http://www.ralinktech.com.tw/data/drivers/%{SourceDir}.tar.bz2
 Source1:        http://www.ralinktech.com.tw/data/drivers/ReleaseNote-RT2860.txt
@@ -58,8 +58,8 @@ sed -i 's/\r//' README_STA
 echo "Nothing to build"
 
 %install
-install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless
-install  -p -m 0644 RT2860STA.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/
+install -dm 755 $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2860STA
+install  -p -m 0644 RT2860STA.dat $RPM_BUILD_ROOT/%{_sysconfdir}/Wireless/RT2860STA
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,16 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ReleaseNotes README_STA iwpriv_usage.txt
 %dir %{_sysconfdir}/Wireless
-%config(noreplace) %{_sysconfdir}/Wireless/RT2860STA.dat
+%dir %{_sysconfdir}/Wireless/RT2860STA
+%config(noreplace) %{_sysconfdir}/Wireless/RT2860STA/RT2860STA.dat
 
 %changelog
-* Fri Nov 07 2008 meissner@suse.de
-- imported from opensuse buildservice, reviewed
-- added supplements: for the modaliases, so it gets installed.
-* Tue Oct 21 2008 claes.backstrom@fsfe.org
-- New upstream version 1.8.0.0
-- Add Release Notes document
-* Sun Oct 05 2008 claes.backstrom@fsfe.org
-- Changed name to rt2860-common
-* Sat Oct 04 2008 claes.backstrom@fsfe.org
-- Initial Package