diff --git a/x11/xfce4/xfdesktop/Makefile b/x11/xfce4/xfdesktop/Makefile
index a9c01fe198c..7a010be56f4 100644
--- a/x11/xfce4/xfdesktop/Makefile
+++ b/x11/xfce4/xfdesktop/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2008/07/10 11:38:03 landry Exp $
+# $OpenBSD: Makefile,v 1.22 2008/11/04 16:53:05 landry Exp $
 
 COMMENT=	xfce4 desktop manager
 
 XFCE_PROJECT=	xfdesktop
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfdesktop/patches/patch-Makefile_in b/x11/xfce4/xfdesktop/patches/patch-Makefile_in
index 89b8120ebdb..b12e02ae08f 100644
--- a/x11/xfce4/xfdesktop/patches/patch-Makefile_in
+++ b/x11/xfce4/xfdesktop/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2007/05/08 16:10:48 steven Exp $
---- Makefile.in.orig	Mon Apr  9 17:56:45 2007
-+++ Makefile.in	Tue May  8 20:03:20 2007
-@@ -327,7 +327,7 @@ SUBDIRS = \
+$OpenBSD: patch-Makefile_in,v 1.4 2008/11/04 16:53:05 landry Exp $
+--- Makefile.in.orig	Sat Nov 17 20:52:57 2007
++++ Makefile.in	Tue Nov  4 17:41:48 2008
+@@ -314,7 +314,7 @@ SUBDIRS = \
  	modules \
  	pixmaps
  
diff --git a/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in b/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in
index c780f82a376..67d27007110 100644
--- a/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in
+++ b/x11/xfce4/xfdesktop/patches/patch-modules_menu_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-modules_menu_Makefile_in,v 1.2 2007/05/08 16:10:48 steven Exp $
---- modules/menu/Makefile.in.orig	Mon Apr  9 17:56:43 2007
-+++ modules/menu/Makefile.in	Tue May  8 20:03:20 2007
-@@ -348,7 +348,7 @@ xfce4_desktop_menu_la_LIBADD = \
+$OpenBSD: patch-modules_menu_Makefile_in,v 1.3 2008/11/04 16:53:05 landry Exp $
+--- modules/menu/Makefile.in.orig	Sat Nov 17 20:52:57 2007
++++ modules/menu/Makefile.in	Tue Nov  4 17:41:48 2008
+@@ -337,7 +337,7 @@ xfce4_desktop_menu_la_LIBADD = \
  	$(LIBX11_LIBS) \
  	$(LIBXFCEGUI4_LIBS)
  
diff --git a/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menu-dentry_c b/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menu-dentry_c
index dce466802bf..91a09c22c33 100644
--- a/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menu-dentry_c
+++ b/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menu-dentry_c
@@ -1,7 +1,33 @@
-$OpenBSD: patch-modules_menu_desktop-menu-dentry_c,v 1.1 2008/06/14 16:35:36 landry Exp $
---- modules/menu/desktop-menu-dentry.c.orig	Thu Jun 12 18:24:40 2008
-+++ modules/menu/desktop-menu-dentry.c	Thu Jun 12 18:25:02 2008
-@@ -173,7 +173,7 @@ _menu_shell_insert_sorted(GtkMenuShell *menu_shell, Gt
+$OpenBSD: patch-modules_menu_desktop-menu-dentry_c,v 1.2 2008/11/04 16:53:05 landry Exp $
+--- modules/menu/desktop-menu-dentry.c.orig	Sat Nov 17 20:31:43 2007
++++ modules/menu/desktop-menu-dentry.c	Tue Nov  4 17:42:45 2008
+@@ -59,7 +59,6 @@
+ #define CATEGORIES_FILE "xfce-registered-categories.xml"
+ 
+ static void menu_dentry_legacy_init();
+-G_INLINE_FUNC gboolean menu_dentry_legacy_need_update(XfceDesktopMenu *desktop_menu);
+ static void menu_dentry_legacy_add_all(XfceDesktopMenu *desktop_menu,
+         MenuPathType pathtype);
+ 
+@@ -87,7 +86,7 @@ static gchar **legacy_dirs = NULL;
+ static GHashTable *dir_to_cat = NULL;
+ 
+ /* we don't want most command-line parameters if they're given. */
+-G_INLINE_FUNC gchar *
++static inline gchar *
+ _sanitise_dentry_cmd(gchar *cmd)
+ {
+     gchar *p;
+@@ -101,7 +100,7 @@ _sanitise_dentry_cmd(gchar *cmd)
+     return cmd;
+ }
+ 
+-G_INLINE_FUNC gint
++static inline gint
+ _get_path_depth(const gchar *path)
+ {
+     gchar *p;
+@@ -173,7 +172,7 @@ _menu_shell_insert_sorted(GtkMenuShell *menu_shell, Gt
          if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
              break;
      }
diff --git a/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menuspec_h b/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menuspec_h
new file mode 100644
index 00000000000..a42e21b56a2
--- /dev/null
+++ b/x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menuspec_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-modules_menu_desktop-menuspec_h,v 1.1 2008/11/04 16:53:05 landry Exp $
+--- modules/menu/desktop-menuspec.h.orig	Tue Nov  4 17:43:09 2008
++++ modules/menu/desktop-menuspec.h	Tue Nov  4 17:43:33 2008
+@@ -82,6 +82,6 @@ G_CONST_RETURN gchar *desktop_menuspec_displayname_to_
+  * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or
+  *              menuspec_get_path_multilevel().
+  */
+-G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths);
++void desktop_menuspec_path_free(GPtrArray *paths);
+ 
+ #endif /* ifdef __MENUSPEC_H__ */