diff --git a/audio/faad/Makefile b/audio/faad/Makefile
index 0b6e5cdd6f6..0dffea6f58c 100644
--- a/audio/faad/Makefile
+++ b/audio/faad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2003/05/19 00:10:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2003/08/24 21:27:30 sturm Exp $
 
 COMMENT=	"MPEG2 and MPEG-4 AAC decoder"
 
@@ -17,7 +17,6 @@ MASTER_SITES=	http://faac.sourceforge.net/files/
 
 LIB_DEPENDS=	sndfile:libsndfile->=1.0.1:audio/libsndfile
 
-AUTOCONF_VERSION=2.13
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS}
 USE_LIBTOOL=	Yes
 
@@ -29,6 +28,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-lm" \
 		AUTOCONF_VERSION=${AUTOCONF_VERSION}
 
+.if ${MACHINE_ARCH} == "sparc64"
+PATCH_LIST=	patch-* gcc-*
+.endif
+
 post-patch:
 	@cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} sh bootstrap
 
diff --git a/audio/faad/patches/gcc-common_mp4v2_Makefile_am b/audio/faad/patches/gcc-common_mp4v2_Makefile_am
new file mode 100644
index 00000000000..72579709565
--- /dev/null
+++ b/audio/faad/patches/gcc-common_mp4v2_Makefile_am
@@ -0,0 +1,10 @@
+$OpenBSD: gcc-common_mp4v2_Makefile_am,v 1.1 2003/08/24 21:27:30 sturm Exp $
+--- common/mp4v2/Makefile.am.orig	2003-08-24 15:28:39.000000000 +0200
++++ common/mp4v2/Makefile.am	2003-08-24 15:29:43.000000000 +0200
+@@ -111,3 +111,6 @@ EXTRA_DIST = API_CHANGES \
+ 	libmp4v260.dsp \
+ 	libmp4v2_st60.dsp \
+ 	TODO
++
++mp4file_io.lo:
++	$(LTCXXCOMPILE) -O0 -c mp4file_io.cpp