diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 7b2a45f3f09d..4ae7805bb860 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libfm
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
 
@@ -12,7 +13,7 @@ COMMENT=	The libFM backend library to PCManFM
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
-		menu-cache.1:${PORTSDIR}/x11/menu-cache
+		menu-cache:${PORTSDIR}/x11/menu-cache
 
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index e6d96e97e04d..0e8e660d4ce3 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	lxpanel
 PORTVERSION=	0.5.12
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PORTVERSION}
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Lightweight X11 desktop panel
 
-LIB_DEPENDS=	menu-cache.1:${PORTSDIR}/x11/menu-cache
+LIB_DEPENDS=	menu-cache:${PORTSDIR}/x11/menu-cache
 RUN_DEPENDS=	${LOCALBASE}/share/desktop-directories/lxde-audio-video.directory:${PORTSDIR}/x11/lxmenu-data
 
 OPTIONS_DEFINE=	ALSA NLS
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index d03a33e360b8..75025f31cfef 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -1,23 +1,21 @@
-# New ports collection makefile for:	x11/menu-cache
-# Date created:				23 Sept 2010
-# Whom:					Kris Moore <kmoore@freebsd.org>
-#
+# Created by: Kris Moore <kmoore@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	menu-cache
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.1
 CATEGORIES=	x11
 MASTER_SITES=	SF/lxde/menu-cache/menu-cache%20${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	The menu-cache portion of LXDE
 
-USE_GNOME=	gnomehack gtk20 pkgconfig
+USES=		pkgconfig
+USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool
-USE_LDCONFIG=	yes
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_FAM=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11/menu-cache/distinfo b/x11/menu-cache/distinfo
index e9fe117eaf9e..ba0e660a7bd0 100644
--- a/x11/menu-cache/distinfo
+++ b/x11/menu-cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (menu-cache-0.3.3.tar.gz) = 07241c1f5f371b426d3b0a6e571a86184ec6256bdd7ead7a4da866cd10f25955
-SIZE (menu-cache-0.3.3.tar.gz) = 392291
+SHA256 (menu-cache-0.4.1.tar.gz) = 4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e
+SIZE (menu-cache-0.4.1.tar.gz) = 412859
diff --git a/x11/menu-cache/files/patch-libmenu-cache__menu-cache.c b/x11/menu-cache/files/patch-libmenu-cache__menu-cache.c
deleted file mode 100644
index eba3d912f996..000000000000
--- a/x11/menu-cache/files/patch-libmenu-cache__menu-cache.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./libmenu-cache/menu-cache.c.orig	2012-03-18 14:12:13.000000000 +1030
-+++ ./libmenu-cache/menu-cache.c	2012-03-18 14:13:02.000000000 +1030
-@@ -226,7 +226,7 @@
- 
-     /* file name */
-     if( G_UNLIKELY( ! fgets( line, G_N_ELEMENTS(line) - 1, f ) ))
--        return;
-+        return NULL;
-     len = strlen( line );
-     if( G_LIKELY(len > 1) )
-         item->file_name = g_strndup( line, len - 1 );
-@@ -240,7 +240,7 @@
- 
-     /* desktop file dir */
-     if( G_UNLIKELY( ! fgets( line, G_N_ELEMENTS(line) - 1, f ) ))
--        return;
-+        return NULL;
-     idx = atoi( line );
-     if( G_LIKELY( idx >=0 && idx < cache->n_all_used_files ) )
-         item->file_dir = cache->all_used_files[ idx ] + 1;
diff --git a/x11/menu-cache/files/patch-menu-cached.c b/x11/menu-cache/files/patch-menu-cached.c
deleted file mode 100644
index 0c191f996116..000000000000
--- a/x11/menu-cache/files/patch-menu-cached.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- menu-cache-daemon/menu-cached.c.o	2011-03-17 10:58:03.876822788 -0400
-+++ menu-cache-daemon/menu-cached.c	2011-03-17 10:58:49.355824755 -0400
-@@ -341,6 +341,29 @@
-                       GFileMonitorEvent evt, Cache* cache )
- {
-     /* DEBUG("file %s is changed (%d).", g_file_get_path(gf), evt); */
-+
-+    if ( evt == G_FILE_MONITOR_EVENT_DELETED )
-+    {
-+        int idx;
-+        /* dirty hack: get index of the monitor in array */
-+        for(idx = 0; idx < cache->n_files; ++idx)
-+        {
-+            if(mon == cache->mons[idx])
-+                break;
-+        }
-+
-+        /* Check if this file or directory was already removed from the cache */
-+        char* changed_file = g_file_get_path(gf);
-+        char* dir_path = cache->files[idx]+1;
-+        int len = strlen(dir_path);
-+        char* base_name = changed_file + len + 1;
-+        gboolean in_cache = is_desktop_file_in_cache(cache, idx, g_file_get_path(gf));
-+        if( ! in_cache ) { /* Means this file was already deleted, no need to refresh cache */
-+          DEBUG("files are changed, but no re-generation is needed.");
-+          return;
-+        }
-+    }
-+
-     /* if( mon != cache->cache_mon ) */
-     {
-         /* Optimization: Some files in the dir are changed, but it
diff --git a/x11/menu-cache/pkg-plist b/x11/menu-cache/pkg-plist
index fc4278c0de6d..876c8c45bdcf 100644
--- a/x11/menu-cache/pkg-plist
+++ b/x11/menu-cache/pkg-plist
@@ -1,10 +1,9 @@
-lib/libmenu-cache.so
-lib/libmenu-cache.so.1
-lib/libmenu-cache.la
-lib/libmenu-cache.a
-libdata/pkgconfig/libmenu-cache.pc
-libexec/menu-cached
-libexec/menu-cache-gen
 include/menu-cache/menu-cache.h
+lib/libmenu-cache.a
+lib/libmenu-cache.la
+lib/libmenu-cache.so
+lib/libmenu-cache.so.2
+libdata/pkgconfig/libmenu-cache.pc
+libexec/menu-cache-gen
+libexec/menu-cached
 @dirrm include/menu-cache
-@dirrmtry libdata/pkgconfig