diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 397260b222b5..cf833c9cbbf6 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	mdh
 PORTVERSION=	1.9.54
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.gozer.org/my_stuff/gtk/gtk/mdh/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK2-based toolbar, sortof a gnomepanel replacement sortof
+COMMENT=	GTK2-based toolbar, like a smaller GNOME panel
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
diff --git a/deskutils/mdh/files/patch-src::mdh.c b/deskutils/mdh/files/patch-src::mdh.c
new file mode 100644
index 000000000000..c1b04cbadb03
--- /dev/null
+++ b/deskutils/mdh/files/patch-src::mdh.c
@@ -0,0 +1,29 @@
+--- src/mdh.c.orig	Thu Nov 13 02:17:50 2003
++++ src/mdh.c	Thu Nov 13 02:18:20 2003
+@@ -140,6 +140,8 @@
+ 
+ static void mdh_toolbar_custom_free(struct custom_t *obj)
+ {
++    g_return_if_fail(obj != NULL);
++
+     g_free(obj->value);
+     g_free(obj->command);
+     g_free(obj->tooltip);
+@@ -147,6 +149,8 @@
+ 
+ static void mdh_toolbar_panel_free(struct panel_t *obj)
+ {
++    g_return_if_fail(obj != NULL);
++
+     g_free(obj->value);
+     g_free(obj->command);
+     g_free(obj->tooltip);
+@@ -186,8 +190,6 @@
+     g_free(mdh_lock);
+     g_free(mdh_cache);
+     g_free(mdh_hist);
+-
+-    exit(0);
+ }
+ 
+ static void mdh_toolbar_init(void)