diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index c317a5a3b94c..bf99f97d6d78 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=    jpeg.11:${PORTSDIR}/graphics/jpeg
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig
 
-OPTIONS=	IPTVPATCH "Stops EIT scans on IPTV channels" On
+OPTIONS=	IPTVPATCH "Stops EIT scans on IPTV channels" On \
+		AC3PATCH "North America DVB-S AC3 audio workaround" Off
 
 DIST_SUBDIR=	vdr
 USE_BZIP2=	yes
@@ -53,9 +54,12 @@ PLIST_SUB+=	VDR_GROUP=${VDR_GROUP}
 .include <bsd.port.options.mk>
 
 .if defined(WITH_IPTVPATCH)
-EXTRA_PATCHES=	${FILESDIR}/vdr-1.7.15-disable_ca_updates.patch \
+EXTRA_PATCHES+=	${FILESDIR}/vdr-1.7.15-disable_ca_updates.patch \
 	${FILESDIR}/vdr-1.7.15-disable_eitscan.patch
 .endif
+.if defined(WITH_AC3PATCH)
+EXTRA_PATCHES+=	${FILESDIR}/vdr-1.7.17-fix_na_dvbs_ac3.diff
+.endif
 
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
diff --git a/multimedia/vdr/files/vdr-1.7.17-fix_na_dvbs_ac3.diff b/multimedia/vdr/files/vdr-1.7.17-fix_na_dvbs_ac3.diff
new file mode 100644
index 000000000000..8ab3a21d5c7e
--- /dev/null
+++ b/multimedia/vdr/files/vdr-1.7.17-fix_na_dvbs_ac3.diff
@@ -0,0 +1,10 @@
+--- pat.c.orig	2011-03-13 23:15:42.000000000 -0700
++++ pat.c	2011-03-14 00:14:40.000000000 -0700
+@@ -486,6 +486,7 @@ void cPatFilter::Process(u_short Pid, u_
+                                  SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
+                                  strn0cpy(lang, I18nNormalizeLanguageCode(ld->languageCode), MAXLANGCODE1);
+                                  }
++                                 IsAc3 = true;
+                                  break;
+                             default: ;
+                             }