diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index b7decdbd1fab..9161cb4b2e46 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -28,20 +28,24 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if !defined(WITHOUT_KDE_MENUS)
+EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=        yes
+WITH_CDPARANOIA=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libfam.a)
 WITH_FAM=	yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=   cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=     CDPARANOIA=""
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
 .else
-PLIST_SUB+=     CDPARANOIA="@comment "
+PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 .if defined(WITH_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
similarity index 100%
rename from devel/gnome-vfs/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
rename to devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index b7decdbd1fab..9161cb4b2e46 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -28,20 +28,24 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+.if !defined(WITHOUT_KDE_MENUS)
+EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=        yes
+WITH_CDPARANOIA=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libfam.a)
 WITH_FAM=	yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=   cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=     CDPARANOIA=""
+LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
+PLIST_SUB+=	CDPARANOIA=""
 .else
-PLIST_SUB+=     CDPARANOIA="@comment "
+PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
 .if defined(WITH_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
similarity index 100%
rename from devel/gnomevfs2/files/patch-modules_vfolder_applications-all-users.vfolder-info.in
rename to devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in