diff --git a/.cvsignore b/.cvsignore
index e69de29..c6303cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+modplugtools-0.5.0.tar.gz
diff --git a/0002-Fix-format-string-related-issues.patch b/0002-Fix-format-string-related-issues.patch
new file mode 100644
index 0000000..64e9046
--- /dev/null
+++ b/0002-Fix-format-string-related-issues.patch
@@ -0,0 +1,78 @@
+From b99b42bb1ddf9966920924c675e8cdcae9fb0ae8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Mon, 21 Jun 2010 09:38:37 +0300
+Subject: [PATCH 2/3] Fix format string related issues.
+
+---
+ modplug-tools/mp123/modplug123.c   |    9 ++++-----
+ modplug-tools/mpplay/modplugplay.c |    6 +++---
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/modplug-tools/mp123/modplug123.c b/modplug-tools/mp123/modplug123.c
+index 7acf930..8c8d411 100644
+--- a/modplug-tools/mp123/modplug123.c
++++ b/modplug-tools/mp123/modplug123.c
+@@ -94,7 +94,6 @@ command line option handling
+ static struct termios stored_settings;
+ int audio_fd, mixer_fd;
+ unsigned char audio_buffer[BUF_SIZE];
+-char order[3];
+ 
+ typedef struct {
+ 	int x, y;
+@@ -317,7 +316,7 @@ for (song=1; song<argc; song++) {
+ 
+     d = getFileData(argv[song], &size);
+     if (d == NULL) continue;
+-    printf(" [%d]\n",size);
++    printf(" [%ld]\n",size);
+ 
+     // Note: All "Basic Settings" must be set before ModPlug_Load.
+     settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */
+@@ -356,8 +355,8 @@ for (song=1; song<argc; song++) {
+     set_keypress();
+     strcpy(songname, ModPlug_GetName(f2));
+     if (strlen(songname)==0) strcpy(songname,argv[song]);
+-    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
+-    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,format.rate,format.channels,settings.mBits,order);
++    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
++    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
+ 
+     gettimeofday(&tvstart,NULL);
+     tvptotal.tv_sec=tvptotal.tv_usec=0;
+@@ -375,7 +374,7 @@ for (song=1; song<argc; song++) {
+     	    }
+ 	    /*printf("%d %d\n",mlen,len);*/
+         }
+-	printf(status,tv.tv_sec-tvstart.tv_sec-tvptotal.tv_sec,tv.tv_usec/100000,format.rate,format.channels,settings.mBits,order/*,rev,revdly,sur,surdly,bas,basrng*/);
++	printf(status,tv.tv_sec-tvstart.tv_sec-tvptotal.tv_sec,tv.tv_usec/100000,format.rate,format.channels,settings.mBits/*,rev,revdly,sur,surdly,bas,basrng*/);
+ 	fflush(stdout);
+ 
+ 	if ((mlen==0) && (loop==1)) {
+diff --git a/modplug-tools/mpplay/modplugplay.c b/modplug-tools/mpplay/modplugplay.c
+index c8b2ae1..e776f02 100644
+--- a/modplug-tools/mpplay/modplugplay.c
++++ b/modplug-tools/mpplay/modplugplay.c
+@@ -390,7 +390,7 @@ for (song=1; song<argc; song++) {
+ 
+     d = getFileData(argv[song], &size);
+     if (d == NULL) continue;
+-    printf(" [%d]\n",size);
++    printf(" [%ld]\n",size);
+ 
+     if (ioctl(audio_fd,SNDCTL_DSP_SETFMT, &format) == -1) {
+ 	perror("SND_CTL_DSP_SETFMT");
+@@ -443,8 +443,8 @@ for (song=1; song<argc; song++) {
+     set_keypress();
+     strcpy(songname, ModPlug_GetName(f2));
+     if (strlen(songname)==0) strcpy(songname,argv[song]);
+-    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);
+-    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000,speed,channels,settings.mBits,order);
++    sprintf(status,"playing %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
++    if (loop) sprintf(status,"looping %s (%%d.%%d/%d\") (%%d/%%d/%%d%%s)    \b\b\b\b",songname,ModPlug_GetLength(f2)/1000);
+ 
+     gettimeofday(&tvstart,NULL);
+     tvptotal.tv_sec=tvptotal.tv_usec=0;
+-- 
+1.7.0.1
+
diff --git a/0003-Usage-message-help-h-fixes.patch b/0003-Usage-message-help-h-fixes.patch
new file mode 100644
index 0000000..5bd7ecc
--- /dev/null
+++ b/0003-Usage-message-help-h-fixes.patch
@@ -0,0 +1,133 @@
+From 5fbe6bba280fffd12bca1ddac97142e682f80571 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Mon, 21 Jun 2010 09:41:53 +0300
+Subject: [PATCH 3/3] Usage message/--help/-h fixes.
+
+Fixes exit status, gets rid of spurious "too few arguments" and fixes
+program name in output.
+---
+ modplug-tools/mp123/modplug123.c   |   16 ++++++++--------
+ modplug-tools/mpplay/modplugplay.c |   16 ++++++++--------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/modplug-tools/mp123/modplug123.c b/modplug-tools/mp123/modplug123.c
+index 8c8d411..ffa10bb 100644
+--- a/modplug-tools/mp123/modplug123.c
++++ b/modplug-tools/mp123/modplug123.c
+@@ -163,13 +163,14 @@ void versioninfo()
+ 	printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
+ }
+ 
+-void help(char *s)
++void help(char *s, int exitcode)
+ {
+ 	printf("Copyright (C) 2003 Gürkan Sengün\n");
+         printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
+ 	printf("\n");
+-	printf("%s: too few arguments\n",s);
+-	printf("Usage: modplugplay" /*[OPTIONS]*/" [FILES]\n");
++	if (exitcode!=0)
++		printf("%s: too few arguments\n",s);
++	printf("Usage: %s" /*[OPTIONS]*/" [FILES]\n",s);
+ 	printf("\n");
+ 
+ 	printf("  -v/--version  print version info\n");
+@@ -181,7 +182,7 @@ void help(char *s)
+ 	printf("  -i   use stdin for file input\n");
+ 	printf("  -q   be quiet\n");
+ */	
+-	exit(1);
++	exit(exitcode);
+ }
+ 
+ char *getFileData(char *filename, long *size)
+@@ -265,7 +266,7 @@ int main(int argc, char* argv[])
+     pollfds.events = POLLIN;    /* Wait for input */
+ 
+     if (argc==1) {
+-	help(argv[0]);
++	help(argv[0],1);
+     }
+ 
+     if (!get_term_size(STDIN_FILENO,&terminal)) {
+@@ -280,7 +281,7 @@ for (song=1; song<argc; song++) {
+     if (argv[song][0] == '-') {
+       if (!songsplayed && strstr(argv[song],"-h")) {
+         printf("\n");
+-        help(argv[0]);
++        help(argv[0],0);
+       } else if (!songsplayed && strstr(argv[song],"-v")) {
+ 	versioninfo();
+         exit(0);
+@@ -290,8 +291,7 @@ for (song=1; song<argc; song++) {
+       }
+       if (argv[song][1] == '-') { // not a song
+         if (strstr(argv[song],"--help")) {
+-          help(argv[0]);
+-          exit(0);
++          help(argv[0],0);
+         } else if (strstr(argv[song],"--version")) {
+ 	  versioninfo();
+ 	  exit(0);
+diff --git a/modplug-tools/mpplay/modplugplay.c b/modplug-tools/mpplay/modplugplay.c
+index e776f02..9e9e5ef 100644
+--- a/modplug-tools/mpplay/modplugplay.c
++++ b/modplug-tools/mpplay/modplugplay.c
+@@ -164,13 +164,14 @@ void versioninfo()
+ 	printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
+ }
+ 
+-void help(char *s)
++void help(char *s, int exitcode)
+ {
+ 	printf("Copyright (C) 2003 Gürkan Sengün\n");
+         printf("Version %s compiled on %s at %s.\n",VERSION,__DATE__,__TIME__);
+ 	printf("\n");
+-	printf("%s: too few arguments\n",s);
+-	printf("Usage: modplugplay" /*[OPTIONS]*/" [FILES]\n");
++	if (exitcode!=0)
++		printf("%s: too few arguments\n",s);
++	printf("Usage: %s" /*[OPTIONS]*/" [FILES]\n",s);
+ 	printf("\n");
+ 
+ 	printf("  -v/--version  print version info\n");
+@@ -182,7 +183,7 @@ void help(char *s)
+ 	printf("  -i   use stdin for file input\n");
+ 	printf("  -q   be quiet\n");
+ */	
+-	exit(1);
++	exit(exitcode);
+ }
+ 
+ int get_byteorder() 
+@@ -332,7 +333,7 @@ int main(int argc, char* argv[])
+     pollfds.events = POLLIN;    /* Wait for input */
+ 
+     if (argc==1) {
+-	help(argv[0]);
++	help(argv[0],1);
+     }
+ 
+     if (!get_term_size(STDIN_FILENO,&terminal)) {
+@@ -347,7 +348,7 @@ for (song=1; song<argc; song++) {
+     if (argv[song][0] == '-') {
+       if (!songsplayed && strstr(argv[song],"-h")) {
+         printf("\n");
+-        help(argv[0]);
++        help(argv[0],0);
+       } else if (!songsplayed && strstr(argv[song],"-v")) {
+ 	versioninfo();
+         exit(0);
+@@ -357,8 +358,7 @@ for (song=1; song<argc; song++) {
+       }
+       if (argv[song][1] == '-') { // not a song
+         if (strstr(argv[song],"--help")) {
+-          help(argv[0]);
+-          exit(0);
++          help(argv[0],0);
+         } else if (strstr(argv[song],"--version")) {
+ 	  versioninfo();
+ 	  exit(0);
+-- 
+1.7.0.1
+
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..52a0715
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+modplugtools-0_5_0-2_fc13:HEAD:modplugtools-0.5.0-2.fc13.src.rpm:1277305678
diff --git a/modplugtools-0.5.0-libmodplug087.patch b/modplugtools-0.5.0-libmodplug087.patch
new file mode 100644
index 0000000..fa31304
--- /dev/null
+++ b/modplugtools-0.5.0-libmodplug087.patch
@@ -0,0 +1,14 @@
+diff -up modplugtools-0.5.0/mp123/modplug123.c~ modplugtools-0.5.0/mp123/modplug123.c
+--- modplugtools-0.5.0/mp123/modplug123.c~	2010-04-11 10:29:58.000000000 +0300
++++ modplugtools-0.5.0/mp123/modplug123.c	2010-06-05 23:26:40.353051833 +0300
+@@ -324,8 +324,10 @@ for (song=1; song<argc; song++) {
+     settings.mChannels = 2;
+     settings.mBits = 16;
+     settings.mFrequency = 44100;
++#if 0
+     settings.mStereoSeparation = 128;
+     settings.mMaxMixChannels = 256;
++#endif
+     /* insert more setting changes here */
+     ModPlug_SetSettings(&settings);
+ 
diff --git a/modplugtools-0.5.0-modplugplay-aoss.patch b/modplugtools-0.5.0-modplugplay-aoss.patch
new file mode 100644
index 0000000..6ec3d72
--- /dev/null
+++ b/modplugtools-0.5.0-modplugplay-aoss.patch
@@ -0,0 +1,22 @@
+diff -up modplugtools-0.5.0/mpplay/Makefile.am~ modplugtools-0.5.0/mpplay/Makefile.am
+--- modplugtools-0.5.0/mpplay/Makefile.am~	2010-04-11 11:23:52.000000000 +0300
++++ modplugtools-0.5.0/mpplay/Makefile.am	2010-06-05 23:32:55.259052522 +0300
+@@ -4,5 +4,5 @@ INCLUDES = \
+         $(LIBMODPLUG_CFLAGS)
+ 
+ modplugplay_SOURCES = modplugplay.c
+-modplugplay_LDADD = $(LIBMODPLUG_LIBS)
++modplugplay_LDADD = $(LIBMODPLUG_LIBS) -laoss
+ 
+diff -up modplugtools-0.5.0/mpplay/Makefile.in~ modplugtools-0.5.0/mpplay/Makefile.in
+--- modplugtools-0.5.0/mpplay/Makefile.in~	2010-04-11 11:33:49.000000000 +0300
++++ modplugtools-0.5.0/mpplay/Makefile.in	2010-06-05 23:33:10.520052700 +0300
+@@ -109,7 +109,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@
+-LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@
++LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@ -laoss
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/modplugtools.spec b/modplugtools.spec
new file mode 100644
index 0000000..d713a07
--- /dev/null
+++ b/modplugtools.spec
@@ -0,0 +1,68 @@
+Name:           modplugtools
+Version:        0.5.0
+Release:        2%{?dist}
+Summary:        Command line mod music players
+
+Group:          Applications/Multimedia
+License:        GPLv3
+URL:            http://modplug-xmms.sourceforge.net/
+Source0:        http://download.sourceforge.net/modplug-xmms/%{name}-%{version}.tar.gz
+# Make modplug123 work with libmodplug < 0.8.8 (not for upstream)
+Patch0:         %{name}-0.5.0-libmodplug087.patch
+# Make modplugplay more likely to work out of the box (not for upstream)
+Patch1:         %{name}-0.5.0-modplugplay-aoss.patch
+# http://sf.net/tracker/?func=detail&aid=3019146&group_id=1275&atid=301275
+Patch2:         0002-Fix-format-string-related-issues.patch
+# http://sf.net/tracker/?func=detail&aid=3019148&group_id=1275&atid=301275
+Patch3:         0003-Usage-message-help-h-fixes.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  libmodplug-devel
+BuildRequires:  libao-devel >= 0.8.0
+BuildRequires:  alsa-oss-devel
+Obsoletes:      modplugplay < 2.06
+Provides:       modplugplay = 1:%{version}-%{release}
+
+%description
+%{summary}.
+
+
+%prep
+%setup -q
+if ! pkg-config --atleast-version 0.8.8 libmodplug ; then
+%patch0 -p1
+fi
+%patch1 -p1
+%patch2 -p2
+%patch3 -p2
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{_bindir}/modplug123
+%{_bindir}/modplugplay
+
+
+%changelog
+* Mon Jun 21 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.5.0-2
+- Patch to fix --help related issues (#600835).
+- Patch to fix format string issues (#600835).
+- License: GPLv3 (per the AUTHORS file) (#600835).
+
+* Sat May  8 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.5.0-1
+- First build.
diff --git a/sources b/sources
index e69de29..d085678 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d41699c9a2a662f2191200ddef5678b0  modplugtools-0.5.0.tar.gz