diff --git a/devel/Makefile b/devel/Makefile
index 5d5c59400a12..d6740a55891b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -993,6 +993,7 @@
     SUBDIR += p5-File-HomeDir
     SUBDIR += p5-File-Lock
     SUBDIR += p5-File-MMagic
+    SUBDIR += p5-File-MMagic-XS
     SUBDIR += p5-File-MimeInfo
     SUBDIR += p5-File-Modified
     SUBDIR += p5-File-NCopy
diff --git a/devel/p5-File-MMagic-XS/Makefile b/devel/p5-File-MMagic-XS/Makefile
new file mode 100644
index 000000000000..fc379ddb9a6c
--- /dev/null
+++ b/devel/p5-File-MMagic-XS/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for:	p5-File-MMagic-XS
+# Date created:				18 Jun 2006
+# Whom:					Aaron Dalton <aaron@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	File-MMagic-XS
+PORTVERSION=	0.08
+CATEGORIES=	devel perl5
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	aaron@FreeBSD.org
+COMMENT=	Guess File Type With XS (a la mod_mime_magic)
+
+MAN3=	File::MMagic::XS.3
+
+PERL_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=	requires at least Perl 5.6.  Please install lang/perl5.8 and try again
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/p5-File-MMagic-XS/distinfo b/devel/p5-File-MMagic-XS/distinfo
new file mode 100644
index 000000000000..a1bcd6b10728
--- /dev/null
+++ b/devel/p5-File-MMagic-XS/distinfo
@@ -0,0 +1,3 @@
+MD5 (File-MMagic-XS-0.08.tar.gz) = b8ce9617527a999c85d54fc8a4e88ebc
+SHA256 (File-MMagic-XS-0.08.tar.gz) = 40ce6a8a6229e861fb8deefe2f82a3a529968c75e58b04d7388fe7a2d6c92bc2
+SIZE (File-MMagic-XS-0.08.tar.gz) = 54434
diff --git a/devel/p5-File-MMagic-XS/pkg-descr b/devel/p5-File-MMagic-XS/pkg-descr
new file mode 100644
index 000000000000..6091aa05b266
--- /dev/null
+++ b/devel/p5-File-MMagic-XS/pkg-descr
@@ -0,0 +1,23 @@
+This is a port of Apache2 mod_mime_magic.c in Perl, written in XS with the 
+aim of being efficient and fast especially for applications that need to 
+be run for an extended amount of time.
+
+There is a compatibility layer for File::MMagic. you can specify :compat 
+when importing the module
+
+   use File::MMagic::XS qw(:compat);
+
+And then the following methods are going to be available from 
+File::MMagic::XS:
+
+   checktype_filename
+   checktype_filehandle
+   checktype_contents
+   addMagicEntry
+
+Currently this software is in beta. If you have 
+suggestions/recommendations about the interface or anything else, now is 
+your chance to send them!
+
+WWW: http://search.cpan.org/dist/File-MMagic-XS
+Author: Daisuke Maki <dmaki@cpan.org>
diff --git a/devel/p5-File-MMagic-XS/pkg-plist b/devel/p5-File-MMagic-XS/pkg-plist
new file mode 100644
index 000000000000..d61502bf0018
--- /dev/null
+++ b/devel/p5-File-MMagic-XS/pkg-plist
@@ -0,0 +1,12 @@
+%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/XS.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/benchmark.pl
+%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/compat.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic/magic
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS/XS.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS/XS.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic/XS
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/MMagic
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/MMagic
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File