diff --git a/chroot-buildpackages.sh b/chroot-buildpackages.sh
index 34eee15ba1..74e207e397 100644
--- a/chroot-buildpackages.sh
+++ b/chroot-buildpackages.sh
@@ -12,8 +12,8 @@
 create_chroot()
 {
 	local target_dir="$1"
-	debootstrap --variant=buildd --include=ccache,locales,git,ca-certificates,devscripts --arch=$ARCH \
-		--foreign $RELEASE $target_dir "http://localhost:3142/$APT_MIRROR"
+	debootstrap --variant=buildd --include=ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl \
+		--arch=$ARCH --foreign $RELEASE $target_dir "http://localhost:3142/$APT_MIRROR"
 	[[ $? -ne 0 || ! -f $target_dir/debootstrap/debootstrap ]] && exit_with_error "Create chroot first stage failed"
 	cp /usr/bin/$QEMU_BINARY $target_dir/usr/bin/
 	chroot $target_dir /bin/bash -c "/debootstrap/debootstrap --second-stage"
@@ -84,13 +84,17 @@ chroot_build_packages()
 		[[ -n "$package_builddeps" ]] && /root/install-deps.sh $package_builddeps
 		cd /root/build
 		display_alert "Downloading sources"
-		git clone $package_repo $package_dir ${package_branch:+ -b $package_branch} --single-branch
+		GIT_EXTRA="--single-branch"
+		[[ -z "$package_commit" ]] && GIT_EXTRA="\$GIT_EXTRA --depth 1"
+		[[ -n "$package_branch" ]] && GIT_EXTRA="\$GIT_EXTRA -b $package_branch"
+		git clone $package_repo $package_dir \$GIT_EXTRA
 		cd $package_dir
 		[[ -n "$package_commit" ]] && git checkout -f $package_commit
 		# unpack debianization files if needed
 		[[ -n "$package_overlay" ]] && tar xf /root/overlay/$package_overlay -C /root/build/$package_dir
 		[[ -n "$package_prebuild_eval" ]] && eval "$package_prebuild_eval"
-		# TODO: increment base version if needed
+		# set upstream version
+		[[ -n "$package_upstream_version" ]] && debchange --preserve --newversion "$package_upstream_version" "Import from upstream"
 		# set local version
 		debchange -l~armbian${REVISION}+ "New Armbian release"
 		# build
@@ -116,6 +120,7 @@ chroot_build_packages()
 		# TODO: move built packages to $DEST/debs/extras
 		# mv $target_dir/root/build/*.deb $DEST/debs/extras
 		# cleanup
-		unset package_name package_repo package_dir package_branch package_overlay package_builddeps package_commit package_install package_prebuild_eval
+		unset package_name package_repo package_dir package_branch package_overlay package_builddeps package_commit package_install \
+			package_prebuild_eval package_upstream_version
 	done
 }
diff --git a/configuration.sh b/configuration.sh
index f18bf72efc..dc293d5632 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -11,7 +11,7 @@
 
 # common options
 
-REVISION="5.14$SUBREVISON" # all boards have same revision
+REVISION="5.15$SUBREVISON" # all boards have same revision
 ROOTPWD="1234" # Must be changed @first login
 MAINTAINER="Igor Pecovnik" # deb signature
 MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
diff --git a/extras-buildpkgs/00-libdri2.conf b/extras-buildpkgs/00-libdri2.conf
index 14024743af..016e5dfde3 100644
--- a/extras-buildpkgs/00-libdri2.conf
+++ b/extras-buildpkgs/00-libdri2.conf
@@ -2,7 +2,5 @@
 local package_name="libDRI2"
 local package_repo="https://github.com/robclark/libdri2.git"
 local package_dir="libdri2-1"
-local package_branch=""
-local package_commit=""
 local package_overlay="libdri2-1.tar.xz"
 local package_builddeps="xutils-dev x11proto-xext-dev x11proto-dri2-dev quilt pkg-config libxfixes-dev libxext-dev libdrm-dev dh-autoreconf debhelper"
diff --git a/extras-buildpkgs/06-xf86-video-fbturbo.conf b/extras-buildpkgs/06-xf86-video-fbturbo.conf
index 6f70dee712..242e2b3d0c 100644
--- a/extras-buildpkgs/06-xf86-video-fbturbo.conf
+++ b/extras-buildpkgs/06-xf86-video-fbturbo.conf
@@ -3,7 +3,6 @@
 local package_name="xf86-video-fbturbo"
 local package_repo="https://github.com/ssvb/xf86-video-fbturbo.git"
 local package_dir="xf86-video-fbturbo"
-local package_branch=""
 local package_builddeps="debhelper dh-autoreconf pkg-config xserver-xorg-dev x11proto-core-dev x11proto-fonts-dev x11proto-randr-dev x11proto-render-dev x11proto-video-dev xutils-dev"
 local package_overlay="xf86-video-fbturbo.tar.xz"
 local package_install="no"
diff --git a/extras-buildpkgs/ffmpeg.conf b/extras-buildpkgs/ffmpeg.conf
new file mode 100644
index 0000000000..70d2820785
--- /dev/null
+++ b/extras-buildpkgs/ffmpeg.conf
@@ -0,0 +1,8 @@
+# FFmpeg
+local package_name="FFmpeg"
+local package_repo="https://github.com/FFmpeg/FFmpeg.git"
+local package_dir="ffmpeg"
+local package_branch="release/3.1"
+local package_upstream_version="7:3.1.0"
+local package_overlay="ffmpeg.tar.xz"
+local package_builddeps="dpkg-dev flite1-dev frei0r-plugins-dev ladspa-sdk libass-dev libavc1394-dev libbluray-dev libbs2b-dev libbz2-dev libcaca-dev libcdio-paranoia-dev libdc1394-22-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libgl1-mesa-dev libgme-dev libgnutls28-dev libgsm1-dev libiec61883-dev libjack-jackd2-dev liblzma-dev libmodplug-dev libmp3lame-dev libopenal-dev libopencore-amrnb-dev libopencore-amrwb-dev libopencv-dev libopenjpeg-dev libopus-dev libpulse-dev librtmp-dev libschroedinger-dev libsctp-dev libsdl-dev libshine-dev libsnappy-dev libsoxr-dev libspeex-dev libssh-gcrypt-dev libtheora-dev libtwolame-dev libva-dev libvdpau-dev libvo-aacenc-dev libvo-amrwbenc-dev libvorbis-dev libvpx-dev libwavpack-dev libwebp-dev libx264-dev libx265-dev libxext-dev libxvidcore-dev libxvmc-dev libzmq3-dev libzvbi-dev pkg-config texinfo yasm cleancss doxygen node-less"
diff --git a/extras-buildpkgs/ffmpeg.tar.xz b/extras-buildpkgs/ffmpeg.tar.xz
new file mode 100644
index 0000000000..151572eeb4
Binary files /dev/null and b/extras-buildpkgs/ffmpeg.tar.xz differ
diff --git a/extras-buildpkgs/guvcview.conf b/extras-buildpkgs/guvcview.conf
index 16bbee1062..2140911d3e 100644
--- a/extras-buildpkgs/guvcview.conf
+++ b/extras-buildpkgs/guvcview.conf
@@ -2,6 +2,6 @@
 local package_name="guvcview"
 local package_repo="https://github.com/avafinger/guvcview.git"
 local package_dir="guvcview"
-local package_branch=""
+local package_upstream_version="2.0.2.1"
 local package_overlay="guvcview.tar.xz"
 local package_builddeps="intltool dh-autoreconf autotools-dev libsdl1.2-dev libgtk-3-dev portaudio19-dev libpng12-dev libavcodec-dev libavutil-dev libudev-dev libusb-1.0-0-dev libpulse-dev libgsl0-dev libv4l-dev libv4l2rds0 libsdl2-dev"
diff --git a/extras-buildpkgs/hostapd.conf b/extras-buildpkgs/hostapd.conf
index c97d9a7a92..7276d90617 100644
--- a/extras-buildpkgs/hostapd.conf
+++ b/extras-buildpkgs/hostapd.conf
@@ -3,5 +3,6 @@ local package_name="hostapd"
 local package_repo="http://w1.fi/hostap.git"
 local package_dir="hostapd"
 local package_branch="hostap_2_5"
+local package_upstream_version="2.5"
 local package_overlay="hostapd.tar.xz"
 local package_builddeps="debhelper pkg-config libssl-dev libreadline-dev libpcsclite-dev libnl-route-3-dev libnl-genl-3-dev libnl-3-dev libncurses5-dev libdbus-1-dev docbook-utils docbook-to-man"
diff --git a/extras-buildpkgs/sunxi-tools.conf b/extras-buildpkgs/sunxi-tools.conf
index c4faef6e7a..cbf5a56435 100644
--- a/extras-buildpkgs/sunxi-tools.conf
+++ b/extras-buildpkgs/sunxi-tools.conf
@@ -2,6 +2,5 @@
 local package_name="sunxi-tools"
 local package_repo="https://github.com/linux-sunxi/sunxi-tools.git"
 local package_dir="sunxi-tools"
-local package_branch=""
 local package_overlay="sunxi-tools.tar.xz"
 local package_builddeps="debhelper libusb-1.0-0-dev ruby binutils-arm-none-eabi pkg-config u-boot-tools"