diff --git a/classes/Config.php b/classes/Config.php
index c0c5325..dcd7f8e 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -31,7 +31,7 @@ Class Config
     public $python = '/usr/bin/python';
     public $params = '--no-playlist --no-warnings -f best';
     public $convert = false;
-    public $avconv = 'ffmpeg/ffmpeg';
+    public $avconv = 'vendor/ffmpeg/ffmpeg/ffmpeg';
 
     /**
      * Config constructor
diff --git a/composer.json b/composer.json
index 4dab258..5abc2e0 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,8 @@
         "slim/slim": "~2.6.2",
         "slim/views": "~0.1.3",
         "rudloff/smarty-plugin-noscheme": "~0.1.0",
-        "symfony/yaml": "~2.7.6"
+        "symfony/yaml": "~2.7.6",
+        "ffmpeg/ffmpeg": "~2.8.2"
     },
     "require-dev": {
         "symfony/var-dumper": "~2.7.6"
@@ -34,6 +35,17 @@
                     "reference": "2015.11.13"
                 }
             }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "ffmpeg/ffmpeg",
+                "version": "2.8.2",
+                "dist": {
+                    "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+                    "type": "xz"
+                }
+            }
         }
     ],
     "authors": [
diff --git a/composer.lock b/composer.lock
index 4d1ae0b..95b0ef1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9e5e7fd038b781a2e3d8225c106c4cf8",
-    "content-hash": "f12c36b7fa62650562772e94d85a1a8a",
+    "hash": "f0413ea9f5a3839553b545d6f8d97a04",
+    "content-hash": "17101d634f04111528073e6c9e5dcb8c",
     "packages": [
+        {
+            "name": "ffmpeg/ffmpeg",
+            "version": "2.8.2",
+            "dist": {
+                "type": "xz",
+                "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+                "reference": null,
+                "shasum": null
+            },
+            "type": "library"
+        },
         {
             "name": "jeremykendall/php-domain-parser",
             "version": "3.0.0",
diff --git a/config.example.yml b/config.example.yml
index 7dd9940..067d6cc 100644
--- a/config.example.yml
+++ b/config.example.yml
@@ -2,4 +2,4 @@ youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py
 python: /usr/bin/python
 params: --no-playlist --no-warnings -f best
 convert: false
-avconv: ffmpeg/ffmpeg
+avconv: vendor/ffmpeg/ffmpeg/ffmpeg
diff --git a/ffmpeg/.gitignore b/ffmpeg/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/ffmpeg/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/package.json b/package.json
index bb6eff6..4997c0f 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,6 @@
         "url": "https://github.com/Rudloff/alltube.git"
     },
     "scripts": {
-        "postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt; curl http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz -o ffmpeg.tar.xz; tar xJf ffmpeg.tar.xz -C ffmpeg --strip-components=1"
+        "postinstall": "./node_modules/bower/bin/bower install; ./node_modules/grunt-cli/bin/grunt"
     }
 }