diff --git a/x11/xfce4/exo/Makefile b/x11/xfce4/exo/Makefile
index 7b13c379e03..e4a1013b674 100644
--- a/x11/xfce4/exo/Makefile
+++ b/x11/xfce4/exo/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2009/04/28 19:38:40 landry Exp $
+# $OpenBSD: Makefile,v 1.15 2009/05/11 20:49:44 landry Exp $
 
 COMMENT=	Xfce4 extension library
 
 XFCE_VERSION=	0.3.101
 XFCE_PROJECT=	exo
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS=	exo-0.3		5.0 \
 		exo-hal-0.3	5.0
diff --git a/x11/xfce4/exo/patches/patch-exo-open_main_c b/x11/xfce4/exo/patches/patch-exo-open_main_c
new file mode 100644
index 00000000000..bc46b20b343
--- /dev/null
+++ b/x11/xfce4/exo/patches/patch-exo-open_main_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-exo-open_main_c,v 1.1 2009/05/11 20:49:44 landry Exp $
+--- exo-open/main.c.orig	Mon May 11 21:55:30 2009
++++ exo-open/main.c	Mon May 11 21:55:48 2009
+@@ -110,6 +110,7 @@ main (int argc, char **argv)
+   g_option_context_set_help_enabled (context, FALSE);
+   g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+   g_option_context_add_group (context, gtk_get_option_group (TRUE));
++  g_option_context_set_ignore_unknown_options (context, TRUE);
+   if (!g_option_context_parse (context, &argc, &argv, &err))
+     {
+       g_fprintf (stderr, "exo-open: %s.\n", err->message);
diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile
index 60971766e8d..76956a6566d 100644
--- a/x11/xfce4/xfce4-panel/Makefile
+++ b/x11/xfce4/xfce4-panel/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2009/04/28 19:49:31 landry Exp $
+# $OpenBSD: Makefile,v 1.24 2009/05/11 20:49:44 landry Exp $
 
 COMMENT=	Xfce4 desktop panel
 
 XFCE_PROJECT=	xfce4-panel
+PKGNAME=	${DISTNAME}p0
 
 SHARED_LIBS=	xfce4panel	2.3	#2.2
 
diff --git a/x11/xfce4/xfce4-panel/patches/patch-plugins_launcher_launcher-exec_c b/x11/xfce4/xfce4-panel/patches/patch-plugins_launcher_launcher-exec_c
new file mode 100644
index 00000000000..479c0ed893f
--- /dev/null
+++ b/x11/xfce4/xfce4-panel/patches/patch-plugins_launcher_launcher-exec_c
@@ -0,0 +1,39 @@
+$OpenBSD: patch-plugins_launcher_launcher-exec_c,v 1.1 2009/05/11 20:49:44 landry Exp $
+--- plugins/launcher/launcher-exec.c.orig	Sat Apr 18 16:40:09 2009
++++ plugins/launcher/launcher-exec.c	Mon May 11 22:13:33 2009
+@@ -264,6 +264,9 @@ launcher_exec_parse_argv (LauncherEntry   *entry,
+     GSList       *li;
+     gchar       **argv = NULL;
+ 
++    if (entry->terminal)
++        g_string_append (command_line, "exo-open --launch TerminalEmulator ");
++
+     /* build the full command */
+     for (p = entry->exec; *p != '\0'; ++p)
+     {
+@@ -378,24 +381,7 @@ launcher_exec_parse_argv (LauncherEntry   *entry,
+     DBG ("Execute: %s", command_line->str);
+ 
+     /* create the argv */
+-    if (G_LIKELY (command_line->str != NULL))
+-    {
+-        if (entry->terminal == FALSE)
+-        {
+-            /* use glib to parge the argv */
+-            g_shell_parse_argv (command_line->str, NULL, &argv, error);
+-        }
+-        else
+-        {
+-            /* we parse our own argv here so exo-open will handle all attributes without problems */
+-            argv = g_new (gchar *, 5);
+-            argv[0] = g_strdup ("exo-open");
+-            argv[1] = g_strdup ("--launch");
+-            argv[2] = g_strdup ("TerminalEmulator");
+-            argv[3] = g_strdup (command_line->str);
+-            argv[4] = NULL;
+-        }
+-    }
++    g_shell_parse_argv (command_line->str, NULL, &argv, error);
+ 
+     /* cleanup */
+     g_string_free (command_line, TRUE);
diff --git a/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist_c b/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist_c
new file mode 100644
index 00000000000..a8a933c1e97
--- /dev/null
+++ b/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-plugins_tasklist_tasklist_c,v 1.1 2009/05/11 20:49:44 landry Exp $
+--- plugins/tasklist/tasklist.c.orig	Mon Jan 12 22:35:30 2009
++++ plugins/tasklist/tasklist.c	Mon Apr 13 13:42:46 2009
+@@ -105,7 +105,10 @@ tasklist_handle_exposed (GtkWidget      *widget,
+         gtk_paint_handle (widget->style, widget->window,
+                           GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
+                           &(event->area), widget, "handlebox",
+-                          x, y, w, h, orientation);
++                          x, y, w, h,
++                          (orientation == GTK_ORIENTATION_HORIZONTAL ?
++                              GTK_ORIENTATION_VERTICAL :
++                              GTK_ORIENTATION_HORIZONTAL));
+ 
+         return TRUE;
+     }