diff --git a/audio/tempest/Makefile b/audio/tempest/Makefile
index 2cbf9bd20b1..6aa4e1d529f 100644
--- a/audio/tempest/Makefile
+++ b/audio/tempest/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2001/12/28 22:11:58 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.7 2002/03/18 15:37:37 wilfried Exp $
 
 COMMENT=	"sends AM radio signals using a monitor"
 
-VERSION=	1.0.4
+VERSION=	1.0.5
 DISTNAME=	tempest_for_eliza-${VERSION}
 PKGNAME=	tempest-${VERSION}
 CATEGORIES=	audio
-NEED_VERSION=	1.435
+NEED_VERSION=	1.505
 
 HOMEPAGE=	http://www.erikyyy.de/tempest/
 
@@ -21,6 +21,8 @@ MASTER_SITES=	${HOMEPAGE}
 
 NO_REGRESS=	Yes
 
+RUN_DEPENDS=	:mad-*:audio/mad \
+		:sox-*:audio/sox
 LIB_DEPENDS=	SDL::devel/sdl
 
 USE_X11=	Yes
@@ -30,11 +32,10 @@ CONFIGURE_STYLE= gnu
 
 SONGS=	forelise jonny saints ungarian fruehling oldmacdonald tempest
 
-post-patch:
-	@touch ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in
-
 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/tempest_for_eliza ${PREFIX}/bin/tempest
+	${INSTALL_PROGRAM} ${WRKBUILD}/tempest_for_eliza ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/tempest_for_mp3 ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mksong.sh ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tempest
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tempest
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tempest
diff --git a/audio/tempest/distinfo b/audio/tempest/distinfo
new file mode 100644
index 00000000000..557d52662d0
--- /dev/null
+++ b/audio/tempest/distinfo
@@ -0,0 +1,3 @@
+MD5 (tempest_for_eliza-1.0.5.tar.gz) = e29c700a7ae15aaaa4c36cbe94e38afc
+RMD160 (tempest_for_eliza-1.0.5.tar.gz) = 821aca84aa9767a49c2c8f49465feb76162ad918
+SHA1 (tempest_for_eliza-1.0.5.tar.gz) = d8abd0ee015a49aa30302d5087fb176314ae6e3b
diff --git a/audio/tempest/files/md5 b/audio/tempest/files/md5
deleted file mode 100644
index 018bc1bffc2..00000000000
--- a/audio/tempest/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (tempest_for_eliza-1.0.4.tar.gz) = 09ee51adff54dda4de0f0b90e13f7d49
-RMD160 (tempest_for_eliza-1.0.4.tar.gz) = 03440af822b1069853e6958474af3a6085b4c5bd
-SHA1 (tempest_for_eliza-1.0.4.tar.gz) = d612561ae93ded4711c4e6d9ffb4d3bbb44a3e1e
diff --git a/audio/tempest/patches/patch-README b/audio/tempest/patches/patch-README
new file mode 100644
index 00000000000..1993c86abe0
--- /dev/null
+++ b/audio/tempest/patches/patch-README
@@ -0,0 +1,61 @@
+$OpenBSD: patch-README,v 1.1 2002/03/18 15:37:37 wilfried Exp $
+--- README.orig	Sat Dec  1 18:45:25 2001
++++ README	Mon Mar 18 08:20:34 2002
+@@ -112,15 +112,8 @@ o The Complete, Unofficial TEMPEST Infor
+ 
+         http://www.eskimo.com/~joelm/tempest.html
+ 
+-Compiling and runnning
+-----------------------
+-
+-you must have libSDL installed.
+-see http://www.devolution.com/~slouken/SDL/
+-
+-type
+-  ./configure
+-  make
++Running
++-------
+ 
+ now start X11. make sure that you choose low colordepth this gives much higher speed !!!
+ 8 bpp is optimal.
+@@ -140,7 +133,7 @@ dial close to 10 Megahertz
+ 
+ now start
+ 
+-./tempest_for_eliza 105000000  1024     768      1400   10000000  songs/forelise
++tempest_for_eliza 105000000  1024     768      1400   10000000  songs/forelise
+                     pixelclock Hdisplay VDisplay HTotal radio     music
+                     *1000000                            frequency file
+ 
+@@ -174,14 +167,14 @@ Tempest for MP3
+ ---------------
+ 
+ get your favourite mp3 file to the current directory. let's call it
+-'foobar.mp3'. make sure you have "amp" and "sox" installed. you must
++'foobar.mp3'. make sure you have "madplay" and "sox" installed. you must
+ use X11 with 8 bits colordepth. use the old -bpp 8 option to your
+ xserver or the new -fbbpp 8 option if you have a newer Xserver.
+ 
+ first we need to find out what the correct sampling rate will
+ be. therefore start:
+ 
+-./tempest_for_mp3 115500000 1024 768 1350 810 1500000 0 20  notexist.raw
++tempest_for_mp3 115500000 1024 768 1350 810 1500000 0 20  notexist.raw
+                   pixel-clock    resy     vtotal      playmode
+                             resx     htotal   radio-frequency
+                                                         amplification
+@@ -199,11 +192,11 @@ it will display:
+ 
+ now take this value and convert your mp3 like this:
+ 
+-./mksong.sh 13519 foobar.mp3 cool.raw
++mksong.sh 13519 foobar.mp3 cool.raw
+ 
+ you can now listen to it with this command:
+ 
+-./tempest_for_mp3 115500000 1024 768 1350 810 1500000 0 20  cool.raw
++tempest_for_mp3 115500000 1024 768 1350 810 1500000 0 20  cool.raw
+ 
+ notice the low radio frequency of only 1500 KHz. well... i found out
+ that you actually don't need a short wave radio if you put your
diff --git a/audio/tempest/patches/patch-mksong_sh b/audio/tempest/patches/patch-mksong_sh
new file mode 100644
index 00000000000..1d8e946a4a3
--- /dev/null
+++ b/audio/tempest/patches/patch-mksong_sh
@@ -0,0 +1,25 @@
+$OpenBSD: patch-mksong_sh,v 1.1 2002/03/18 15:37:37 wilfried Exp $
+--- mksong.sh.orig	Sat Dec  1 18:32:39 2001
++++ mksong.sh	Mon Mar 18 08:21:58 2002
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++# !/bin/sh
+ 
+ set -e
+ 
+@@ -6,9 +6,12 @@ echo target sampling rate is $1
+ echo input file is $2
+ echo output file is $3
+ 
++ftmp=`mktemp`
++mv "${ftmp}" "${ftmp}".wav
++
+ echo first decoding mp3...
+-amp -convert -w $2 delme.wav
++madplay --output=wave:"${ftmp}".wav "${2}"
+ echo now converting into raw and resampling
+-sox delme.wav -r $1 -t raw -u -b -c 1 $3
+-rm delme.wav
++sox "${ftmp}".wav -r "${1}" -t raw -u -b -c 1 "${3}"
++rm -f "${ftmp}".wav
+ echo done.
diff --git a/audio/tempest/pkg/PLIST b/audio/tempest/pkg/PLIST
index f3ab311117d..a43da72d6d4 100644
--- a/audio/tempest/pkg/PLIST
+++ b/audio/tempest/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/08/14 23:02:58 pvalchev Exp $
-bin/tempest
+@comment $OpenBSD: PLIST,v 1.3 2002/03/18 15:37:37 wilfried Exp $
+bin/mksong.sh
+bin/tempest_for_eliza
+bin/tempest_for_mp3
 share/doc/tempest/README
 share/tempest/forelise
 share/tempest/fruehling