diff --git a/sysutils/Makefile b/sysutils/Makefile
index 5fbe178a54d6..06f603f4a728 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -360,6 +360,7 @@
     SUBDIR += tct
     SUBDIR += tdir
     SUBDIR += tentakel
+    SUBDIR += testdisk
     SUBDIR += thefish
     SUBDIR += ticker.app
     SUBDIR += timelimit
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
new file mode 100644
index 000000000000..a2dd41a0c8ee
--- /dev/null
+++ b/sysutils/testdisk/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:	testdisk
+# Date created:				Feb 28 2004
+# Whom:					Florent Thoumie <flz@xbsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	testdisk
+PORTVERSION=	5.1
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www.cgsecurity.org/
+
+MAINTAINER=	flz@xbsd.org
+COMMENT=	Tool to check and undelete partitions
+
+WRKSRC=		${WRKDIR}/${PORTNAME}/src
+USE_REINPLACE=	yes
+PLIST_FILES=	bin/testdisk
+
+.if defined(WITH_E2FSPROGS)
+BUILD_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500040
+IGNORE=		"Requires FreeBSD 5.x, some defines are missing in sys/disk.h before __FreeBSD_version 500040"
+.endif
+
+.if !defined(WITH_E2FSPROGS)
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "You can define the following for additional features:"
+	@${ECHO_MSG} ""
+.if !defined(WITH_E2FSPROGS)
+	@${ECHO_MSG} "WITH_E2FSPROGS  - Use ext2fs extensions.
+.endif
+	@${ECHO_MSG} ""
+.endif
+
+post-patch:
+.if defined(WITH_E2FSPROGS)
+	@${REINPLACE_CMD} -e 's|-DHAVE_PROGSREISERFS31.*||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|^\(LIBS=\).*|\1${PREFIX}/lib/libext2fs.a|' ${WRKSRC}/Makefile
+.else
+	@${REINPLACE_CMD} -e 's|-DHAVE_E2FSPROGS.*||' ${WRKSRC}/Makefile
+.endif
+	@${REINPLACE_CMD} -e 's|^bsd:|all:|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|^\(LIBSA=\).*|\1|' ${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/testdisk ${PREFIX}/bin
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
new file mode 100644
index 000000000000..1c8f78fa7712
--- /dev/null
+++ b/sysutils/testdisk/distinfo
@@ -0,0 +1,2 @@
+MD5 (testdisk-5.1.tar.gz) = c86eb08730a52a113ae572de75ff9c9e
+SIZE (testdisk-5.1.tar.gz) = 618498
diff --git a/sysutils/testdisk/pkg-descr b/sysutils/testdisk/pkg-descr
new file mode 100644
index 000000000000..80b545c09958
--- /dev/null
+++ b/sysutils/testdisk/pkg-descr
@@ -0,0 +1,18 @@
+Tool to check and undelete partition
+Works with the following partitions:
+- FAT12 FAT16 FAT32
+- Linux EXT2/EXT3
+- Linux SWAP (version 1 and 2)
+- NTFS (Windows NT/W2K/XP)
+- BeFS (BeOS)
+- UFS (BSD)
+- Netware
+- ReiserFS
+
+TestDisk is under GNU Public License.
+You can compile it under Dos with DJGPP or under Linux or BSD with gcc.
+
+WWW: http://www.cgsecurity.org/
+
+- Florent Thoumie
+flz@xbsd.org