diff --git a/x11/xfe/Makefile b/x11/xfe/Makefile
index a20cb418e32..501a5c495e0 100644
--- a/x11/xfe/Makefile
+++ b/x11/xfe/Makefile
@@ -1,22 +1,22 @@
-# $OpenBSD: Makefile,v 1.7 2007/10/16 14:46:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2008/01/03 12:05:24 ajacoutot Exp $
 
 COMMENT=	MS-Explorer like file manager for X
 
 DISTNAME= 	xfe-1.04
-PKGNAME=	${DISTNAME}p0
-CATEGORIES= 	x11	
+PKGNAME=	${DISTNAME}p1
+CATEGORIES= 	x11
 
 HOMEPAGE=	http://roland65.free.fr/xfe/
 
 MAINTAINER= 	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # GPL
-PERMIT_PACKAGE_CDROM=	Yes 
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}	
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xfe/}
 
 WANTLIB=	c m stdc++ png X11 Xft
 
diff --git a/x11/xfe/patches/patch-src_File_cc b/x11/xfe/patches/patch-src_File_cc
new file mode 100644
index 00000000000..366064d5ed5
--- /dev/null
+++ b/x11/xfe/patches/patch-src_File_cc
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_File_cc,v 1.1 2008/01/03 12:05:24 ajacoutot Exp $
+--- src/File.cc.orig	Wed Jan  2 17:20:09 2008
++++ src/File.cc	Wed Jan  2 17:20:44 2008
+@@ -491,7 +491,10 @@ FXint isEmptyDir(const FXString directory)
+ 		else
+ 			ret=0;
+ 	}
+-	closedir(dir);
++
++	if (dir)
++		closedir(dir);
++
+ 	return ret;
+ }
+