diff --git a/xfdesktop-4.6.0-redhat-menus.patch b/xfdesktop-4.6.0-redhat-menus.patch
index 7ba2e6a..e36e88f 100644
--- a/xfdesktop-4.6.0-redhat-menus.patch
+++ b/xfdesktop-4.6.0-redhat-menus.patch
@@ -10,7 +10,7 @@
          <Separator/>
          <Merge type="all"/>
          <Separator/>
-@@ -28,10 +29,15 @@
+@@ -28,10 +29,16 @@
      </Layout>
      
      <Menu>
@@ -24,12 +24,13 @@
 +                <Category>Settings</Category>
 +                <Not><Category>System</Category></Not>
 +                <Not><Category>Screensaver</Category></Not>
++                <Not><Filename>fedora-im-chooser.desktop</Filename></Not>
 +                <Not><Filename>gnome-default-applications.desktop</Filename></Not>
 +            </And>
          </Include>
          
          <Layout>
-@@ -40,25 +46,29 @@
+@@ -40,25 +47,29 @@
              <Merge type="all"/>
          </Layout>
          
@@ -71,7 +72,7 @@
          </Include>
      </Menu>
      
-@@ -124,7 +134,11 @@
+@@ -124,7 +135,11 @@
          <Name>System</Name>
          <Directory>xfce-system.directory</Directory>
          <Include>
@@ -84,7 +85,7 @@
          </Include>
      </Menu>
      
-@@ -133,7 +147,13 @@
+@@ -133,7 +148,13 @@
          <Directory>xfce-other.directory</Directory>
          <OnlyUnallocated/>
          <Include>
diff --git a/xfdesktop-4.6.1-education-menu-icon.patch b/xfdesktop-4.6.1-education-menu-icon.patch
new file mode 100644
index 0000000..ec395e5
--- /dev/null
+++ b/xfdesktop-4.6.1-education-menu-icon.patch
@@ -0,0 +1,10 @@
+--- xfdesktop-4.6.0.orig/modules/menu/directory-data/xfce-education.directory.in	2009-01-12 23:03:19.000000000 +0100
++++ xfdesktop-4.6.0/modules/menu/directory-data/xfce-education.directory.in	2009-12-20 17:38:25.000000000 +0100
+@@ -2,6 +2,6 @@
+ Version=1.0
+ Encoding=UTF-8
+ Type=Directory
+-Icon=
++Icon=applications-science
+ _Name=Education
+ _Comment=Educational software
diff --git a/xfdesktop.spec b/xfdesktop.spec
index f313b48..44c891f 100644
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -1,7 +1,7 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
 Version: 4.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfdesktop-%{version}.tar.bz2
@@ -12,6 +12,9 @@ Patch0: xfdesktop-4.5.92-backdrop-image.patch
 Patch1: xfdesktop-4.5.92-desktop-menu-icon.patch
 # Use redhat-menus to avoid duplicate entries in the menu
 Patch2: xfdesktop-4.6.0-redhat-menus.patch
+# fix icon in xfce-education.directory, taken from
+# http://git.xfce.org/xfce/xfdesktop/commit/?id=c2de873891d8ce8c3be1399c6110ebfda489151b
+Patch3: xfdesktop-4.6.1-education-menu-icon.patch
 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,6 +52,7 @@ This package includes a desktop manager for the XFce Desktop Environment.
 %patch0 -p1 -b .backdrop
 %patch1 -p1 -b .distro-logo
 %patch2 -p1 -b .orig
+%patch3 -p1 -b .icon
 
 %build
 %configure
@@ -58,7 +62,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
@@ -98,6 +102,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/xfce4/panel-plugins/xfce4-menu.desktop
 
 %changelog
+* Sun Dec 20 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.1-4
+- Menu fixes
+
 * Sun Nov 01 2009 Christoph Wickert <cwickert@fedoraproject.org> - 4.6.1-3
 - Fix dependency for default background image