diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
index e30aa03946..02039f0860 100644
--- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
@@ -354,7 +354,7 @@ class SubdefsController extends Controller
             Subdef::TYPE_VIDEO     => [
                 "definitions" => [
                     "video codec H264"                 => null,
-                    "144P H264 128 kbps ACC 128kbps"   => [
+                    "144P H264 128 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "128",
@@ -362,10 +362,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "256",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "240P H264 256 kbps ACC 128kbps"   => [
+                    "240P H264 256 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "256",
@@ -373,10 +373,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "426",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "360P H264 576 kbps ACC 128kbps"   => [
+                    "360P H264 576 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "576",
@@ -384,10 +384,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "480",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libtheora",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "480P H264 750 kbps ACC 128kbps"   => [
+                    "480P H264 750 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "750",
@@ -395,10 +395,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "854",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "720P H264 1492 kbps ACC 128kbps"  => [
+                    "720P H264 1492 kbps MP3 128kbps"  => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "1492",
@@ -406,10 +406,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "1280",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "1080P H264 2420 kbps ACC 128kbps" => [
+                    "1080P H264 2420 kbps MP3 128kbps" => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "2420",
@@ -417,11 +417,11 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "1920",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libx264",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
                     "video codec libvpx"               => null,
-                    "144P webm 128 kbps ACC 128kbps"   => [
+                    "144P webm 128 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "128",
@@ -429,10 +429,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "256",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "240P webm 256 kbps ACC 128kbps"   => [
+                    "240P webm 256 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "256",
@@ -440,10 +440,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "426",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "360P webm 576 kbps ACC 128kbps"   => [
+                    "360P webm 576 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "576",
@@ -451,10 +451,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "480",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "480P webm 750 kbps ACC 128kbps"   => [
+                    "480P webm 750 kbps MP3 128kbps"   => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "750",
@@ -462,10 +462,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "854",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "720P webm 1492 kbps ACC 128kbps"  => [
+                    "720P webm 1492 kbps MP3 128kbps"  => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "1492",
@@ -473,10 +473,10 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "1280",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
-                    "1080P webm 2420 kbps ACC 128kbps" => [
+                    "1080P webm 2420 kbps MP3 128kbps" => [
                         Video::OPTION_AUDIOBITRATE    => "128",
                         Video::OPTION_AUDIOSAMPLERATE => "44100",
                         Video::OPTION_BITRATE         => "2420",
@@ -484,7 +484,7 @@ class SubdefsController extends Controller
                         Video::OPTION_SIZE            => "1920",
                         Video::OPTION_FRAMERATE       => "25",
                         Video::OPTION_VCODEC          => "libvpx",
-                        Video::OPTION_ACODEC          => "libfaac",
+                        Video::OPTION_ACODEC          => "libmp3lame",
                         Subdef::OPTION_DEVICE         => ["all"]
                     ],
                 ],
diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Video.php b/lib/Alchemy/Phrasea/Media/Subdef/Video.php
index ef0a113564..1b0ce097b0 100644
--- a/lib/Alchemy/Phrasea/Media/Subdef/Video.php
+++ b/lib/Alchemy/Phrasea/Media/Subdef/Video.php
@@ -33,7 +33,7 @@ class Video extends Audio
         $this->registerOption(new OptionType\Range($this->translator->trans('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20));
         $this->registerOption(new OptionType\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264'));
         $this->unregisterOption(self::OPTION_ACODEC);
-        $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis'], 'libfaac'));
+        $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis', 'libfdk_aac'], 'libfdk_aac'));
     }
 
     public function getType()