diff --git a/audio/Makefile b/audio/Makefile
index fe777a0ff5e7..6d7ab5da66cb 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -185,6 +185,7 @@
     SUBDIR += mp3info
     SUBDIR += mp3mover
     SUBDIR += mp3rename
+    SUBDIR += mp3riot
     SUBDIR += mp3splt
     SUBDIR += mp3stat
     SUBDIR += mp3wrap
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
new file mode 100644
index 000000000000..db27da76d829
--- /dev/null
+++ b/audio/mp3riot/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	mp3riot
+# Date created:			29 July 2003
+# Whom:				Francisco Gomez <francisco@gomezmarin.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mp3riot
+PORTVERSION=	1.1
+CATEGORIES=	audio
+MASTER_SITES=	http://www.linuxsecure.de/f2html/
+
+MAINTAINER=	francisco@gomezmarin.com
+COMMENT=	Mp3riot creates mp3 playlists, HTML files, etc
+
+RUN_DEPENDS=	${SITE_PERL}/MP3/Info.pm:${PORTSDIR}/audio/p5-MP3-Info
+
+NO_BUILD=	yes
+USE_ZIP=	yes
+NO_WRKSUBDIR=	yes
+
+PORTDOCS=	example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+RUN_DEPENDS+=	${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long
+.endif
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/mp3riot ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for item in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${item} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/mp3riot/distinfo b/audio/mp3riot/distinfo
new file mode 100644
index 000000000000..94d033e1c0a9
--- /dev/null
+++ b/audio/mp3riot/distinfo
@@ -0,0 +1 @@
+MD5 (mp3riot-1.1.zip) = 934d2ea05059b1945bfa062e0dd43eeb
diff --git a/audio/mp3riot/pkg-descr b/audio/mp3riot/pkg-descr
new file mode 100644
index 000000000000..eec350e1ee1f
--- /dev/null
+++ b/audio/mp3riot/pkg-descr
@@ -0,0 +1,12 @@
+mp3riot (formerly known as f2html.pl) is a command line utility
+that searches recursively through directories, builds a file list
+(with additional file information), and generates HTML files,
+playlists, etc. The output can be controlled, links can be corrected,
+and more. The script is mainly desigend to create Web pages,
+playlists, and databases for MP3 and Ogg files, but can also used for
+other purposes.
+
+WWW: http://www.linuxsecure.de/index.php?action=55
+
+- Francisco -
+francisco@gomezmarin.com
diff --git a/audio/mp3riot/pkg-plist b/audio/mp3riot/pkg-plist
new file mode 100644
index 000000000000..16443aea5d8a
--- /dev/null
+++ b/audio/mp3riot/pkg-plist
@@ -0,0 +1 @@
+bin/mp3riot