diff --git a/multimedia/vitunes/Makefile b/multimedia/vitunes/Makefile
new file mode 100755
index 00000000000..c1d79d36dca
--- /dev/null
+++ b/multimedia/vitunes/Makefile
@@ -0,0 +1,38 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/05/31 10:11:11 laurent Exp $
+
+COMMENT =		curses media indexer and player for vi users
+
+DISTNAME =		vitunes-1.0.5
+
+CATEGORIES =		multimedia
+
+HOMEPAGE =		http://www.vitunes.org/
+
+MAINTAINER =		Laurent Fanis <laurent@openbsd.org>
+
+# BSD
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB =		c  m ncurses util
+
+LIB_DEPENDS =		tag,tag_c::audio/taglib
+
+RUN_DEPENDS =		::x11/mplayer
+			
+MASTER_SITES =		${HOMEPAGE}/files/
+
+EXTRACT_SUFX =		.tgz
+
+ALL_TARGET =		vitunes
+
+NO_REGRESS=		Yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/vitunes ${PREFIX}/bin
+#	${INSTALL_PROGRAM} ${WRKSRC}/add_urls.sh ${PREFIX}/add_urls.sh
+	${INSTALL_MAN} ${WRKSRC}/vitunes.1 ${PREFIX}/man/man1/vitunes.1
+
+.include <bsd.port.mk>
diff --git a/multimedia/vitunes/distinfo b/multimedia/vitunes/distinfo
new file mode 100644
index 00000000000..5d73ec6f003
--- /dev/null
+++ b/multimedia/vitunes/distinfo
@@ -0,0 +1,5 @@
+MD5 (vitunes-1.0.5.tgz) = AJG/0jKeWmmTYagndieO0g==
+RMD160 (vitunes-1.0.5.tgz) = rfyYOxSJYAZ4HdGQ15JPHdthi8o=
+SHA1 (vitunes-1.0.5.tgz) = s2mYiEi0o2m7oWsI5nMVrtsMs8c=
+SHA256 (vitunes-1.0.5.tgz) = Rh4dxsfaGEAO/uyVaA/EHIs4NI4JN3U6R4I06WQ6PRg=
+SIZE (vitunes-1.0.5.tgz) = 60498
diff --git a/multimedia/vitunes/pkg/DESCR b/multimedia/vitunes/pkg/DESCR
new file mode 100644
index 00000000000..c3b1c9de309
--- /dev/null
+++ b/multimedia/vitunes/pkg/DESCR
@@ -0,0 +1,13 @@
+vitunes is a curses-based music player and playlist manager for *nix 
+whose goals are: 
+
+1. a minimalistic appearance
+2. strong vi-like bindings
+3. quick playlist creation/management.
+
+vitunes does not strive to be a full-blown media player, but rather 
+a full-blown media indexer and playlist manager.
+Additionally, vitunes never needs write-access to anything outside 
+of its work directory (default is ~/.vitunes/).
+It never touches/modifies anything outside of there and doesn't leave 
+junk files anywhere. 
diff --git a/multimedia/vitunes/pkg/PLIST b/multimedia/vitunes/pkg/PLIST
new file mode 100644
index 00000000000..d57f467ac05
--- /dev/null
+++ b/multimedia/vitunes/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/05/31 10:11:11 laurent Exp $
+@bin bin/vitunes
+@man man/man1/vitunes.1