diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index 844f9d4d24..7546dab63d 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -24,7 +24,7 @@ Addon ffmpeg :
 	gfx_conv_c_lookup.cpp
 #	gfx_conv_mmx.cpp
  	gfx_util.cpp
-	:  
+	:
 	libavformat.a
 	libavcodec.a
 	libavcodec_$(TARGET_ARCH).a
@@ -72,7 +72,7 @@ if $(TARGET_ARCH) = x86 {
 	HAIKU_FFMPEG_DEFINES += ARCH_PPC=1 ;
 	HAIKU_FFMPEG_DEFINES += ARCH_SPARC=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
-	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ; 
+	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=1 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=0 ;
 } else if $(TARGET_ARCH) = sparc {
@@ -80,11 +80,18 @@ if $(TARGET_ARCH) = x86 {
 	HAIKU_FFMPEG_DEFINES += ARCH_PPC=0 ;
 	HAIKU_FFMPEG_DEFINES += ARCH_SPARC=1 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_AMD3DNOW=0 HAVE_AMD3DNOWEXT=0 ;
-	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ; 
+	HAIKU_FFMPEG_DEFINES += HAVE_MMX=0 HAVE_MMX2=0 HAVE_SSE=0 HAVE_SSSE3=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_ALTIVEC=0 ;
 	HAIKU_FFMPEG_DEFINES += HAVE_VIS=1 ;
 }
 
+if $(INCLUDE_GPL_ADDONS) = 1 {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=1 ;
+} else {
+	HAIKU_FFMPEG_DEFINES += CONFIG_GPL=0 ;
+}
+
+
 HAIKU_FFMPEG_DEFINES = [ FDefines $(HAIKU_FFMPEG_DEFINES) ] ;
 
 SubInclude HAIKU_TOP src add-ons media plugins ffmpeg libavcodec ;
diff --git a/src/add-ons/media/plugins/ffmpeg/config.h b/src/add-ons/media/plugins/ffmpeg/config.h
index 35bfae65bb..7d2990a7d2 100644
--- a/src/add-ons/media/plugins/ffmpeg/config.h
+++ b/src/add-ons/media/plugins/ffmpeg/config.h
@@ -123,7 +123,7 @@
 #define CONFIG_FFSERVER 0
 #define CONFIG_FFT 1
 #define CONFIG_GOLOMB 1
-#define CONFIG_GPL 0
+//#define CONFIG_GPL 0 // defined in Jamfile depending on build config
 #define CONFIG_GPROF 0
 #define CONFIG_GRAY 0
 #define CONFIG_HARDCODED_TABLES 1
diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
index 272334b9d7..6764dfa187 100644
--- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/Jamfile
@@ -21,7 +21,6 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
 		dsputil_mmx.c
 		dsputilenc_mmx.c
 		fdct_mmx.c
-#		idct_mmx.c # GPL
 		idct_mmx_xvid.c
 		motion_est_mmx.c
 		mpegvideo_mmx.c
@@ -34,6 +33,11 @@ if $(HAIKU_FFMPEG_USE_MMX) = 1 {
 		fft_mmx.nasm
 		dsputil_yasm.nasm
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		mmxSources +=
+			idct_mmx.c
+		;
+	}
 }
 
 local sseSources = ;
@@ -44,9 +48,13 @@ if $(HAIKU_FFMPEG_USE_SSSE3) = 1 {
 		idct_sse2_xvid.c
 		vp3dsp_sse2.c
 		vp6dsp_sse2.c
-#		h264_idct_sse2.nasm # GPL
-#		h264_deblock_sse2.nasm # GPL
 	;
+	if $(INCLUDE_GPL_ADDONS) = 1 {
+		sseSources +=
+			h264_idct_sse2.nasm
+			h264_deblock_sse2.nasm
+		;
+	}
 }
 
 local amdSources = ;