diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index c098d6bdde7..8ac7c8486d9 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1999/03/05 14:26:57 brad Exp $
+# $OpenBSD: Makefile,v 1.5 1999/03/23 21:33:49 espie Exp $
 
 DISTNAME=	mpg123-0.59q
 CATEGORIES=	audio
@@ -9,6 +9,8 @@ MASTER_SITES=	http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
 		ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \
 		http://ftp.tu-clausthal.de/pub/unix/audio/mpg123
 
+post-patch:
+	cp ${FILESDIR}/audio_openbsd.c ${WRKSRC}
 .if (${MACHINE_ARCH} != "i386")
 ALL_TARGET=	openbsd
 .else
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index e2710b189b6..893cd2c6929 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Mar  5 09:15:38 1999
-+++ Makefile	Fri Mar  5 09:16:43 1999
+--- Makefile.orig	Tue Jan 26 15:35:18 1999
++++ Makefile	Tue Mar 23 03:48:46 1999
 @@ -34,6 +34,7 @@
  	@echo "make aix            IBM AIX (tested: 4.2)"
  	@echo "make os2            IBM OS/2"
@@ -8,21 +8,26 @@
  	@echo "make bsdos          BSDI BSD/OS"
  	@echo "make bsdos-nas      BSDI BSD/OS with NAS support"
  	@echo "make mint           MiNT on Atari"
-@@ -350,7 +351,7 @@
- 		LIBS='-los2me -lsocket' \
- 		mpg123.exe
- 
--netbsd:
-+openbsd netbsd:
- 	$(MAKE) CC=cc LDFLAGS= \
- 		OBJECTS='decode.o dct64.o audio_sun.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
-@@ -358,7 +359,7 @@
- 			-DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+@@ -364,6 +365,22 @@
+ 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ 			-funroll-all-loops -ffast-math -DROT_I386 \
+ 			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++		mpg123-make
++
++openbsd:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode.o dct64.o audio_openbsd.o' \
++		CFLAGS='-Wall -ansi -pedantic -O3 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math \
++			-DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \
++		mpg123-make
++
++openbsd-i386:
++	$(MAKE) CC=cc LDFLAGS= \
++		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_openbsd.o' \
++		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
++			-funroll-all-loops -ffast-math -DROT_I386 \
++			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \
  		mpg123-make
  
--netbsd-i386:
-+openbsd-i386 netbsd-i386:
- 	$(MAKE) CC=cc LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_sun.o' \
- 		CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
+ bsdos:
diff --git a/audio/mpg123/patches/patch-ab b/audio/mpg123/patches/patch-ab
index 2008e1d0113..288f64bbff6 100644
--- a/audio/mpg123/patches/patch-ab
+++ b/audio/mpg123/patches/patch-ab
@@ -1,5 +1,5 @@
---- audio.h.orig	Fri Mar  5 09:17:25 1999
-+++ audio.h	Fri Mar  5 09:18:01 1999
+--- audio.h.orig	Mon Jan 11 17:21:38 1999
++++ audio.h	Tue Mar 23 01:58:01 1999
 @@ -24,7 +24,7 @@
  #define AUDIO_RATE_TOLERANCE	  3