diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
new file mode 100644
index 00000000000..56a815bfbc4
--- /dev/null
+++ b/audio/rioutil/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2004/06/26 07:34:25 mjc Exp $
+
+COMMENT=		"utility for Rio mp3 players"
+
+DISTNAME=		rioutil-1.4.4
+CATEGORIES=		audio
+
+HOMEPAGE=		http://rioutil.sf.net
+
+MAINTAINER=		Michael Coulter <mjc@openbsd.org>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rioutil/}
+
+LIB_DEPENDS=		usb.7.0::devel/libusb
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--with-libusb
+CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
+			LDFLAGS=-L${LOCALBASE}/lib
+
+.include <bsd.port.mk>
diff --git a/audio/rioutil/distinfo b/audio/rioutil/distinfo
new file mode 100644
index 00000000000..da2ed4085cc
--- /dev/null
+++ b/audio/rioutil/distinfo
@@ -0,0 +1,3 @@
+MD5 (rioutil-1.4.4.tar.gz) = 65902f2e8a0ae18b71937ee4d1803f8b
+RMD160 (rioutil-1.4.4.tar.gz) = 20a85891f9d12d1ff9b2ee7c76b217e1b603f691
+SHA1 (rioutil-1.4.4.tar.gz) = 37d3119600b6cecf479ab1f88a5b507c83aed1a3
diff --git a/audio/rioutil/patches/patch-include_rio_internal_h b/audio/rioutil/patches/patch-include_rio_internal_h
new file mode 100644
index 00000000000..f0aabad6426
--- /dev/null
+++ b/audio/rioutil/patches/patch-include_rio_internal_h
@@ -0,0 +1,28 @@
+$OpenBSD: patch-include_rio_internal_h,v 1.1.1.1 2004/06/26 07:34:25 mjc Exp $
+--- include/rio_internal.h.orig	Mon Jan 19 23:41:20 2004
++++ include/rio_internal.h	Wed Jun 23 19:56:43 2004
+@@ -547,6 +547,8 @@ unsigned int    crc32_rio            (un
+ u_int32_t bswap_32(u_int32_t);
+ #elif defined (__NetBSD__)
+ #define bswap_32(x) bswap32(x)
++#elif defined (__OpenBSD__)
++#define bswap_32(x) swap32(x)
+ #endif
+ 
+ #ifndef HAVE_LIBGEN_H
+@@ -563,10 +565,14 @@ char *basename(char *x);
+ 
+ #include <machine/endian.h>
+ 
+-#else
++#elif defined (__OpenBSD__)
+ 
+ #include <sys/endian.h>
++
++#else
++
+ #include <sys/bswap.h>
++#include <sys/endian.h>
+ 
+ #endif
+ 
diff --git a/audio/rioutil/patches/patch-librioutil_cksum_c b/audio/rioutil/patches/patch-librioutil_cksum_c
new file mode 100644
index 00000000000..7e6320c17e1
--- /dev/null
+++ b/audio/rioutil/patches/patch-librioutil_cksum_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-librioutil_cksum_c,v 1.1.1.1 2004/06/26 07:34:25 mjc Exp $
+--- librioutil/cksum.c.orig	Wed Jun 23 20:00:14 2004
++++ librioutil/cksum.c	Wed Jun 23 20:01:33 2004
+@@ -31,6 +31,8 @@
+ #include <endian.h>
+ #elif defined(__FreeBSD__) || defined(__MacOSX__)
+ #include <machine/endian.h>
++#elif defined(__OpenBSD__)
++#include <sys/endian.h>
+ #else
+ #include <sys/endian.h>
+ #include <sys/bswap.h>
diff --git a/audio/rioutil/pkg/DESCR b/audio/rioutil/pkg/DESCR
new file mode 100644
index 00000000000..cb47f5e5ee3
--- /dev/null
+++ b/audio/rioutil/pkg/DESCR
@@ -0,0 +1,3 @@
+A utility designed for interfacing with Rio's third, fourth,
+and fifth generations of portable mp3 players, including the
+Rio 600/800/900/S-Series/Riot/psa[play/Fuse/Chiba/Cali.
diff --git a/audio/rioutil/pkg/PFRAG.shared b/audio/rioutil/pkg/PFRAG.shared
new file mode 100644
index 00000000000..81002aca9c0
--- /dev/null
+++ b/audio/rioutil/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/06/26 07:34:25 mjc Exp $
+lib/librioutil.so.5.1
+DYNLIBDIR(%D/lib)
diff --git a/audio/rioutil/pkg/PLIST b/audio/rioutil/pkg/PLIST
new file mode 100644
index 00000000000..c9e04514c47
--- /dev/null
+++ b/audio/rioutil/pkg/PLIST
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2004/06/26 07:34:25 mjc Exp $
+bin/rioutil
+include/rio.h
+lib/librioutil.a
+lib/librioutil.la
+%%SHARED%%
+man/man1/rioutil.1