diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile
index a33c97da3990..0981f48c82b0 100644
--- a/x11-wm/metacity-setup/Makefile
+++ b/x11-wm/metacity-setup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	metacity-setup
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://plastercast.tzo.com/~plastercast/Projects/ \
 		http://www.marcuscom.com/downloads/ \
diff --git a/x11-wm/metacity-setup/distinfo b/x11-wm/metacity-setup/distinfo
index fe33301595e7..cc9569145988 100644
--- a/x11-wm/metacity-setup/distinfo
+++ b/x11-wm/metacity-setup/distinfo
@@ -1 +1 @@
-MD5 (metacity-setup-0.3.1.tar.gz) = 5d023fa26f7e0e92739ae53e1e614047
+MD5 (metacity-setup-0.4.tar.gz) = 9353e05f7f82f2026a012e9681b7708b
diff --git a/x11-wm/metacity-setup/files/patch-configure b/x11-wm/metacity-setup/files/patch-configure
new file mode 100644
index 000000000000..50d28e0a2c8c
--- /dev/null
+++ b/x11-wm/metacity-setup/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Jun  1 22:26:42 2002
++++ configure	Sat Jun  1 22:26:55 2002
+@@ -2974,7 +2974,7 @@
+ 
+ fi
+ 
+-pkg_modules="libcapplet-2.0 libgnomeui-2.0 libglade-2.0 gtk+-2.0 >= 1.3.13 gconf-2.0 libgnomeui-2.0 gnome-vfs-2.0"
++pkg_modules="libgnomeui-2.0 libglade-2.0 gtk+-2.0 >= 1.3.13 gconf-2.0 libgnomeui-2.0 gnome-vfs-2.0"
+ 
+   succeeded=no
+ 
diff --git a/x11-wm/metacity-setup/files/patch-src_callbacks.c b/x11-wm/metacity-setup/files/patch-src_callbacks.c
index c1eae76366f0..46f8330cce71 100644
--- a/x11-wm/metacity-setup/files/patch-src_callbacks.c
+++ b/x11-wm/metacity-setup/files/patch-src_callbacks.c
@@ -1,13 +1,10 @@
---- src/callbacks.c.orig	Tue May 28 11:52:13 2002
-+++ src/callbacks.c	Tue May 28 11:53:24 2002
-@@ -30,9 +30,7 @@
- 	gchar *possibleThemeDirs[4] =
- 		{ g_build_filename (g_get_home_dir (), ".metacity", "themes",
- 				    NULL),
--		"/gnome/head/INSTALL/share/metacity/themes",
--		"/usr/share/metacity/themes",
--		"/usr/local/share/metacity/themes"
-+		"%%X11BASE%%/share/gnome/metacity/themes"
- 	};
- 	for (i = 0; i < 4; i++)
- 	{
+--- src/callbacks.c.orig	Sat Jun  1 22:27:11 2002
++++ src/callbacks.c	Sat Jun  1 22:27:18 2002
+@@ -9,7 +9,6 @@
+ #include <glade/glade.h>
+ #include <libgnomevfs/gnome-vfs-async-ops.h>
+ #include <libgnomevfs/gnome-vfs-ops.h>
+-#include "capplet-widget.h"
+ #include "stdio.h"
+ #include "stdlib.h"
+ #include "string.h"
diff --git a/x11-wm/metacity-setup/pkg-plist b/x11-wm/metacity-setup/pkg-plist
index d1ccad91e395..0e36b45c1b4b 100644
--- a/x11-wm/metacity-setup/pkg-plist
+++ b/x11-wm/metacity-setup/pkg-plist
@@ -1 +1,2 @@
 bin/metacity-setup
+share/gnome/metacity-setup/pixmaps/Metacity-Setup-Icon2.png