diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile
index 0775214e225c..f006de1b04f2 100644
--- a/multimedia/gstreamer1-libav/Makefile
+++ b/multimedia/gstreamer1-libav/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gstreamer1-libav
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-libav/
 DISTNAME=	gst-libav-${PORTVERSION}
@@ -31,8 +32,8 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
-.if ${COMPILER_TYPE} == "gcc"
-CFLAGS+=	-fno-force-addr
+.if ${COMPILER_TYPE} == clang && ${ARCH} == i386
+CFLAGS+=	-mstack-alignment=16 -mstackrealign
 .endif
 
 post-patch:
diff --git a/multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_libavutil_x86_asm.h b/multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_libavutil_x86_asm.h
deleted file mode 100644
index 69e2fa1bb62c..000000000000
--- a/multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_libavutil_x86_asm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- gst-libs/ext/libav/libavutil/x86/asm.h.orig
-+++ gst-libs/ext/libav/libavutil/x86/asm.h
-@@ -68,7 +68,7 @@
- typedef int x86_reg;
- #endif
- 
--#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
-+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
- #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
- 
- #if ARCH_X86_64 && defined(PIC)