diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index 7851392d..fc116c1b 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -20,7 +20,8 @@ LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi
 
 ## USE ##
 SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd"
-SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
+SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile 
+artswrappersuid dvdr jack dri cdda libav mjpeg mmx joystick xvmc cpudetection v4l v4l2"
 SAB_CODECS="x264 x265 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack"
 SAB_SYSTEM="cjk unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
 SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
diff --git a/conf/intel/portage/package.use/00-sabayon.package.use b/conf/intel/portage/package.use/00-sabayon.package.use
index 7fc684d6..1b862410 100644
--- a/conf/intel/portage/package.use/00-sabayon.package.use
+++ b/conf/intel/portage/package.use/00-sabayon.package.use
@@ -94,8 +94,6 @@ app-leechcraft/lc-lmp kde
 
 app-misc/ddccontrol -gtk -gnome
 app-misc/gcstar stats
-# use libav
-app-misc/strigi -ffmpeg libav
 
 # Kernel drivers are unwanted for lirc, they're in-kernel
 app-misc/lirc -lirc_devices_audio -lirc_devices_audio_alsa -lirc_devices_serial
@@ -347,7 +345,6 @@ gnome-extra/zeitgeist-extensions -fts
 kde-base/ark lzma
 kde-base/dolphin semantic-desktop thumbnail
 kde-base/dolphin-plugins git
-kde-base/ffmpegthumbs libav
 kde-base/gwenview kipi semantic-desktop
 kde-base/kactivities semantic-desktop
 kde-base/ksnapshot kipi
@@ -464,11 +461,11 @@ media-libs/libsdl2 abi_x86_32
 media-libs/libsfml doc examples
 media-libs/libsoundtouch sse2
 media-libs/libxtract fftw
-media-libs/mediastreamer video -ffmpeg libav
+media-libs/mediastreamer video -ffmpeg
 # www-client/chromium wants media-libs/mesa[gles2]
 media-libs/mesa gbm g3dvl nptl openvg pic shared-dricore shared-glapi video_cards_i915 video_cards_i965 video_cards_intel video_cards_nouveau video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_via video_cards_vmware video_cards_radeonsi xa xorg gles2
 media-libs/ming php
-media-libs/mlt libav melt frei0r kdenlive quicktime python
+media-libs/mlt melt frei0r kdenlive quicktime python
 media-libs/openexr -video_cards_nvidia
 # on amd64, if ABI_X86=32 is set, exif must be unset
 media-libs/oyranos -exif
@@ -540,7 +537,6 @@ media-video/blinkensim aalib
 media-video/dvgrab quicktime
 virtual/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx jpeg2k
 media-video/ffmpeg threads ogg vhook faac faad video_cards_nvidia amr cpudetection vpx
-media-video/ffmpeg2theora libav
 media-video/jubler mplayer
 media-video/kino gstreamer quicktime
 media-video/libav amr cpudetection faac faad ogg rtmp threads vhook video_cards_nvidia vpx jpeg2k
@@ -555,10 +551,9 @@ media-video/mplayer2 -xvmc
 # we have media-video/mkvtoolnix-gui
 media-video/mkvtoolnix -qt4 -wxwidgets
 media-video/ogmrip ogm mp4 srt
-media-video/openshot libav
 media-video/totem xulrunner iplayer galago
 media-video/vdr SetGroupSep-Patch atsc cmdsubmenu dvbsetup dxr3 graphtft iptv menuorg pinplugin rotor submenu subtitles ttxtsubs ttxtsubs yaepg
-media-video/vlc aalib egl fontconfig httpd libass libav live lua rtsp samba skins taglib upnp vlm -svg
+media-video/vlc aalib egl fontconfig httpd libass live lua rtsp samba skins taglib upnp vlm -svg
 media-video/xine-ui aalib vdr
 
 # Drop xine-ui from dvdrip, since