diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index c715f87..63b901d 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -6,6 +6,11 @@ Fri Oct 2 20:26:49 CEST 2009 - wr@rosenauer.org
- extend list of supported architectures as ABI identifier
(mozilla-abi.patch) (bnc#543460)
+-------------------------------------------------------------------
+Thu Oct 1 22:54:24 CEST 2009 - llunak@novell.com
+
+- fix KDE button order
+
-------------------------------------------------------------------
Mon Sep 14 00:07:55 CEST 2009 - wr@rosenauer.org
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index ac31563..fd3dec1 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -152,6 +152,8 @@ cd $RPM_BUILD_DIR/mozilla
%patch4 -p1
%patch5 -p1
%patch6 -p1
+# copy current files and patch them later to keep them in sync
+cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
%patch7 -p1
%patch8 -p1
%patch9 -p1
diff --git a/firefox-kde.patch b/firefox-kde.patch
index bbdb738..870fdbc 100644
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@@ -1,5 +1,5 @@
---- mozilla/browser/app/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/app/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/app/Makefile.in.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/app/Makefile.in 2009-10-01 22:04:57.000000000 +0200
@@ -49,6 +49,7 @@ DIRS = profile/extensions
PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js \
@@ -8,8 +8,45 @@
$(NULL)
ifndef MOZ_BRANDING_DIRECTORY
---- mozilla/browser/components/build/nsModule.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/build/nsModule.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/base/content/browser-kde.xul.sav 2009-07-31 08:29:32.000000000 +0200
++++ mozilla/browser/base/content/browser-kde.xul 2009-10-01 22:34:03.000000000 +0200
+@@ -157,7 +157,7 @@
+
+-#else
++#elif XP_UNIX_GNOME
+
+@@ -165,6 +165,14 @@
+ label="&editBookmark.done.label;"
+ default="true"
+ oncommand="StarUI.panel.hidePopup();"/>
++#else
++
++
+ #endif
+
+
+--- mozilla/browser/base/jar.mn.sav 2009-07-31 08:29:32.000000000 +0200
++++ mozilla/browser/base/jar.mn 2009-10-01 22:24:45.000000000 +0200
+@@ -22,6 +22,8 @@ browser.jar:
+ * content/browser/browser.css (content/browser.css)
+ * content/browser/browser.js (content/browser.js)
+ * content/browser/browser.xul (content/browser.xul)
++* content/browser/browser-kde.xul (content/browser-kde.xul)
++% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
+ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
+ * content/browser/credits.xhtml (content/credits.xhtml)
+ * content/browser/metaData.js (content/metaData.js)
+--- mozilla/browser/components/build/nsModule.cpp.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/build/nsModule.cpp 2009-10-01 22:04:57.000000000 +0200
@@ -46,7 +46,7 @@
#elif defined(XP_MACOSX)
#include "nsMacShellService.h"
@@ -38,8 +75,8 @@
#endif
---- mozilla/browser/components/shell/src/Makefile.in.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/shell/src/Makefile.in 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/components/shell/src/Makefile.in.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/shell/src/Makefile.in 2009-10-01 22:04:57.000000000 +0200
@@ -75,11 +75,12 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_
CPPSRCS = nsMacShellService.cpp
else
@@ -54,8 +91,8 @@
endif
endif
endif
---- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsKDEShellService.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/components/shell/src/nsKDEShellService.cpp.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/shell/src/nsKDEShellService.cpp 2009-10-01 22:04:57.000000000 +0200
@@ -0,0 +1,193 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -250,8 +287,8 @@
+ NS_ADDREF(*_retval = defaultReader);
+ return NS_OK;
+ }
---- mozilla/browser/components/shell/src/nsKDEShellService.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsKDEShellService.h 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/components/shell/src/nsKDEShellService.h.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/shell/src/nsKDEShellService.h 2009-10-01 22:04:57.000000000 +0200
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -312,8 +349,8 @@
+};
+
+#endif // nskdeshellservice_h____
---- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/components/shell/src/nsUnixShellService.cpp.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/shell/src/nsUnixShellService.cpp 2009-10-01 22:04:57.000000000 +0200
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -367,8 +404,8 @@
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
---- mozilla/browser/components/shell/src/nsUnixShellService.h.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsUnixShellService.h 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/components/shell/src/nsUnixShellService.h.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/components/shell/src/nsUnixShellService.h 2009-10-01 22:04:57.000000000 +0200
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
@@ -415,8 +452,8 @@
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
---- mozilla/browser/installer/unix/packages-static.sav 2009-09-14 10:00:21.000000000 +0200
-+++ mozilla/browser/installer/unix/packages-static 2009-09-14 10:04:14.000000000 +0200
+--- mozilla/browser/installer/unix/packages-static.sav 2009-10-01 22:03:56.000000000 +0200
++++ mozilla/browser/installer/unix/packages-static 2009-10-01 22:04:57.000000000 +0200
@@ -291,6 +291,7 @@ bin/icons/*.png
bin/@PREF_DIR@/firefox.js
bin/@PREF_DIR@/firefox-branding.js
@@ -425,3 +462,4 @@
bin/greprefs/all.js
bin/greprefs/security-prefs.js
bin/greprefs/xpinstall.js
+