diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index edaf9fdf..d6fa9ea5 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -49,10 +49,25 @@ TOXIC_FILE=/usr/local/bin/toxic
 QTOX_REPO="https://github.com/bashrc/qTox"
 QTOX_COMMIT='505c5043828cf0fc43ee3f16279a131e50edc057'
 
+function mesh_install_ffmpeg
+{
+	chroot "${rootdir}" apt-get -y remove ffmpeg libav-tools
+	chroot "${rootdir}" apt-get -y install build-essential
+	chroot "${rootdir}" apt-get -y install --reinstall libmp3lame-dev libvorbis-dev libtheora-dev libspeex-dev yasm pkg-config
+	mkdir -p ${rootdir}$INSTALL_DIR/ffmpeg-release
+	cd ${rootdir}$INSTALL_DIR
+	wget http://ffmpeg.org/releases/ffmpeg-3.1.tar.bz2
+	tar xvjf ffmpeg-3.1.tar.bz2
+	chroot ${rootdir} /bin/bash -x <<EOF
+cd ${INSTALL_DIR}/ffmpeg-3.1
+./configure --enable-gpl --enable-postproc --enable-swscale --enable-avfilter --enable-libmp3lame --enable-libvorbis --enable-libtheora --enable-libx264 --enable-libspeex --enable-shared --enable-pthreads --enable-libopenjpeg
+make
+make install
+EOF
+	chroot "${rootdir}" apt-get install libav-tools
+}
+
 function mesh_tox_qtox {
-	chroot "${rootdir}" apt-get -y install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
-	chroot "${rootdir}" apt-get -y install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev ffmpeg libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
-    #chroot "${rootdir}" apt-get -y install --force-yes tox-ffmpeg-dev
 	if [ ! ${rootdir}$INSTALL_DIR ]; then
 		INSTALL_DIR=${rootdir}/root/build
 	fi
@@ -61,6 +76,12 @@ function mesh_tox_qtox {
 		mkdir -p ${rootdir}$INSTALL_DIR
 	fi
 
+	chroot "${rootdir}" apt-get -y install build-essential libatk1.0-0 libbz2-1.0 libc6 libcairo2 libdbus-1-3 libegl1-mesa libfontconfig1 libfreetype6 libgcc1 libgdk-pixbuf2.0-0 libgl1-mesa-glx libglib2.0-0 libgtk2.0-0 libice6 libicu52 libjpeg62-turbo libmng1 libmtdev1 libopenal1 libopus0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpng12-0 libqrencode3 libsm6 libsodium13 libsqlite3-0 libssl1.0.0 libstdc++6 libtiff5 libudev1 libvpx1 libwayland-client0 libwayland-cursor0 libwayland-egl1-mesa libwebp5 libx11-6 libx11-xcb1 libxcb-glx0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb1 libxext6 libxfixes3 libxi6 libxrender1 libxss1 zlib1g libopus-dev libvpx-dev
+	chroot "${rootdir}" apt-get -y install build-essential qt5-qmake qt5-default qttools5-dev-tools libqt5opengl5-dev libqt5svg5-dev libopenal-dev libxss-dev qrencode libqrencode-dev libglib2.0-dev libgdk-pixbuf2.0-dev libgtk2.0-dev libsqlcipher-dev libopus-dev libvpx-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libavcodec-dev libavcodec56 libavcodec57 libavfilter-dev libavfilter6
+	#chroot "${rootdir}" apt-get -y install --force-yes tox-ffmpeg-dev
+
+	mesh_install_ffmpeg
+
 	git clone $QTOX_REPO ${rootdir}$INSTALL_DIR/qtox
 	if [ ! -d ${rootdir}$INSTALL_DIR/qtox ]; then
 		exit 72428