diff --git a/homeassistant/components/ffmpeg.py b/homeassistant/components/ffmpeg.py
index 03bf1db885f..0ba015a4660 100644
--- a/homeassistant/components/ffmpeg.py
+++ b/homeassistant/components/ffmpeg.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 import homeassistant.helpers.config_validation as cv
 
 DOMAIN = 'ffmpeg'
-REQUIREMENTS = ["ha-ffmpeg==0.12"]
+REQUIREMENTS = ["ha-ffmpeg==0.13"]
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,15 +32,17 @@ CONFIG_SCHEMA = vol.Schema({
 }, extra=vol.ALLOW_EXTRA)
 
 
-FFMPEG_CONFIG = {}
+FFMPEG_CONFIG = {
+    CONF_FFMPEG_BIN: DEFAULT_BINARY,
+    CONF_RUN_TEST: DEFAULT_RUN_TEST,
+}
 FFMPEG_TEST_CACHE = {}
 
 
 def setup(hass, config):
     """Setup the FFmpeg component."""
-    global FFMPEG_CONFIG
-
-    FFMPEG_CONFIG = config.get(DOMAIN)
+    if DOMAIN in config:
+        FFMPEG_CONFIG.update(config.get(DOMAIN))
     return True
 
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 5b4f6073432..ddce3d01a14 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -115,7 +115,7 @@ googlemaps==2.4.4
 gps3==0.33.3
 
 # homeassistant.components.ffmpeg
-ha-ffmpeg==0.12
+ha-ffmpeg==0.13
 
 # homeassistant.components.mqtt.server
 hbmqtt==0.7.1