diff --git a/sysutils/freesbie/Makefile b/sysutils/freesbie/Makefile
index 82863d43ef76..3eb37265cfee 100644
--- a/sysutils/freesbie/Makefile
+++ b/sysutils/freesbie/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	freesbie
-PORTVERSION=	2.0.20060202
+PORTVERSION=	2.0.20070710
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rrr.de/~riggs/freesbie/
+MASTER_SITES+=	${MASTER_SITE_LOCAL:S/%SUBDIR%/delphij/}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/2.0.//}
 
 MAINTAINER=	riggs@rrr.de
@@ -27,13 +28,8 @@ IGNORE=		earlier FreeBSD versions then 5.4-RELEASE are not supported
 .endif
 
 do-install:
-	@${MKDIR} ${DATADIR}
-	@ cd ${WRKSRC} && ${FIND} . -type f -print | \
-		${CPIO} --quiet -pdum -R ${BINOWN}:${BINGRP} ${DATADIR}
-	@ cd ${DATADIR} && ${FIND} . -type d -print | ${XARGS} ${CHMOD} 0755
-	@ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type f -print | \
-		${SORT} -r > ${TMPPLIST}
-	@ cd ${PREFIX} && ${FIND} share/${PORTNAME} -type d -print | \
-		${SORT} -r | ${SED} -e 's#^#@dirrm #' >> ${TMPPLIST}
+	@ ${MKDIR} ${DATADIR}
+	@ cd ${WRKSRC} && ${FIND} . -type f -print | tar -cf - -T - | \
+	tar -xf - -C ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/freesbie/distinfo b/sysutils/freesbie/distinfo
index 14f676b48860..73f97d466278 100644
--- a/sysutils/freesbie/distinfo
+++ b/sysutils/freesbie/distinfo
@@ -1,3 +1,3 @@
-MD5 (freesbie-20060202.tar.bz2) = a257556e61c9d38667e4f78932e5e062
-SHA256 (freesbie-20060202.tar.bz2) = 0f3bf00fde7af930d868824cbccb9c01235ca77d193be242fe8b2c0bd6f11b22
-SIZE (freesbie-20060202.tar.bz2) = 25434
+MD5 (freesbie-20070710.tar.bz2) = 82d4250a96ea4762aaf4b6b1a39ec8cf
+SHA256 (freesbie-20070710.tar.bz2) = 6712e9a2f84ee6c525b80c75f9f1c9e56f1b1d7ea63511724cd3565caff80d3d
+SIZE (freesbie-20070710.tar.bz2) = 33838
diff --git a/sysutils/freesbie/pkg-plist b/sysutils/freesbie/pkg-plist
new file mode 100644
index 000000000000..ec4eae6a9609
--- /dev/null
+++ b/sysutils/freesbie/pkg-plist
@@ -0,0 +1,95 @@
+%%DATADIR%%/COPYING
+%%DATADIR%%/Makefile
+%%DATADIR%%/README
+%%DATADIR%%/conf/amd64/FREESBIE
+%%DATADIR%%/conf/freesbie.defaults.conf
+%%DATADIR%%/conf/i386/FREESBIE
+%%DATADIR%%/conf/make.conf
+%%DATADIR%%/conf/make.conf.minimal
+%%DATADIR%%/conf/powerpc/FREESBIE
+%%DATADIR%%/conf/rc.d/unionfs
+%%DATADIR%%/conf/rc.d/uzip
+%%DATADIR%%/extra/README
+%%DATADIR%%/extra/adduser.sh
+%%DATADIR%%/extra/adduser/homemfs.rc
+%%DATADIR%%/extra/autologin.sh
+%%DATADIR%%/extra/backup.sh
+%%DATADIR%%/extra/backup/restorebackup.rc
+%%DATADIR%%/extra/backup/restorebackup.sh
+%%DATADIR%%/extra/backup/savebackup.sh
+%%DATADIR%%/extra/buildmodules.sh
+%%DATADIR%%/extra/comconsole.sh
+%%DATADIR%%/extra/customroot.sh
+%%DATADIR%%/extra/customroot/README
+%%DATADIR%%/extra/customscripts.sh
+%%DATADIR%%/extra/customscripts/README
+%%DATADIR%%/extra/etcmfs.sh
+%%DATADIR%%/extra/etcmfs/etcmfs.rc
+%%DATADIR%%/extra/installports.sh
+%%DATADIR%%/extra/l10n.sh
+%%DATADIR%%/extra/l10n/l10n.rc
+%%DATADIR%%/extra/mountdisks.sh
+%%DATADIR%%/extra/mountdisks/mountdisks.sh
+%%DATADIR%%/extra/mountdisks/mountdisksrc.sh
+%%DATADIR%%/extra/pf.sh
+%%DATADIR%%/extra/pf/pf_rules.sh
+%%DATADIR%%/extra/rootmfs.sh
+%%DATADIR%%/extra/rootmfs/rootmfs.rc
+%%DATADIR%%/extra/sound.sh
+%%DATADIR%%/extra/sound/snd_card_ids.txt
+%%DATADIR%%/extra/sound/sound_detect.sh
+%%DATADIR%%/extra/suid.sh
+%%DATADIR%%/extra/swapfind.sh
+%%DATADIR%%/extra/swapfind/swapfind.sh
+%%DATADIR%%/extra/varmfs.sh
+%%DATADIR%%/extra/varmfs/varmfs.rc
+%%DATADIR%%/extra/xautostart.sh
+%%DATADIR%%/extra/xautostart/xautostart.rc
+%%DATADIR%%/extra/xconfig-probe.sh
+%%DATADIR%%/extra/xconfig-probe/xconfig-probe.sh
+%%DATADIR%%/extra/xconfig-probe/xkbdlayout.sh
+%%DATADIR%%/extra/xconfig-probe/xorg.conf.orig
+%%DATADIR%%/extra/xconfig.sh
+%%DATADIR%%/extra/xconfig/xconfig.sh
+%%DATADIR%%/extra/xconfig/xkbdlayout.sh
+%%DATADIR%%/extra/xconfig/xorg.conf.orig
+%%DATADIR%%/scripts/buildkernel.sh
+%%DATADIR%%/scripts/buildworld.sh
+%%DATADIR%%/scripts/cleandir.sh
+%%DATADIR%%/scripts/clonefs.sh
+%%DATADIR%%/scripts/custom/README
+%%DATADIR%%/scripts/extra.sh
+%%DATADIR%%/scripts/flash.sh
+%%DATADIR%%/scripts/img.sh
+%%DATADIR%%/scripts/installkernel.sh
+%%DATADIR%%/scripts/installworld.sh
+%%DATADIR%%/scripts/iso.sh
+%%DATADIR%%/scripts/launch.sh
+%%DATADIR%%/scripts/pkginstall.sh
+%%DATADIR%%/scripts/pkgselect.sh
+%%DATADIR%%/scripts/powerpc/iso.sh
+@dirrm %%DATADIR%%/scripts/powerpc
+@dirrm %%DATADIR%%/scripts/custom
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/extra/xconfig-probe
+@dirrm %%DATADIR%%/extra/xconfig
+@dirrm %%DATADIR%%/extra/xautostart
+@dirrm %%DATADIR%%/extra/varmfs
+@dirrm %%DATADIR%%/extra/swapfind
+@dirrm %%DATADIR%%/extra/sound
+@dirrm %%DATADIR%%/extra/rootmfs
+@dirrm %%DATADIR%%/extra/pf
+@dirrm %%DATADIR%%/extra/mountdisks
+@dirrm %%DATADIR%%/extra/l10n
+@dirrm %%DATADIR%%/extra/etcmfs
+@dirrm %%DATADIR%%/extra/customscripts
+@dirrm %%DATADIR%%/extra/customroot
+@dirrm %%DATADIR%%/extra/backup
+@dirrm %%DATADIR%%/extra/adduser
+@dirrm %%DATADIR%%/extra
+@dirrm %%DATADIR%%/conf/rc.d
+@dirrm %%DATADIR%%/conf/powerpc
+@dirrm %%DATADIR%%/conf/i386
+@dirrm %%DATADIR%%/conf/amd64
+@dirrm %%DATADIR%%/conf
+@dirrm %%DATADIR%%