diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 8a648d01c1c6..db61c371faf8 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -1,49 +1,49 @@
 # New ports collection makefile for:	xffm
 # Date created:		7 June 2003
 # Whom:			James Earl <jdearl@telus.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-fm
 PORTVERSION=	4.2.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
 		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
 DISTNAME=	xffm-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 file manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 gnomehack
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
 		CPPFLAGS=-I${LOCALBASE}/include \
 		LIBS=-L${LOCALBASE}/lib
 
 MAN1=		fgr.1
 
 .if defined(WITH_LIBRSVG)
 USE_GNOME+=	librsvg2
 CONFIGURE_ARGS+=--enable-librsvg
 .else
 CONFIGURE_ARGS+=--disable-librsvg
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xfce4-fm/files/patch-libs-tubo.c b/x11-fm/xfce4-fm/files/patch-libs-tubo.c
new file mode 100644
index 000000000000..07daa7eb8a7e
--- /dev/null
+++ b/x11-fm/xfce4-fm/files/patch-libs-tubo.c
@@ -0,0 +1,15 @@
+--- libs/tubo.c.orig	Sat Oct  8 11:33:42 2005
++++ libs/tubo.c	Sat Oct  8 11:34:37 2005
+@@ -296,9 +296,12 @@
+     printf("tubowait...\n");
+ #endif
+ #ifdef	__FreeBSD__
++#include <osreldate.h>
++#if __FreeBSD_version < 503000
+     /* This apparently does the bug workaround for wait failure
+      * on FreeBSD 5.1: */
+     if (kill(PID,SIGCONT) == 0) return TRUE;
++#endif
+ #endif
+ #ifdef HYPER_DEBUG
+     printf("tubowait...dead...\n");