diff -Nru vlc-2.2.4/debian/changelog vlc-2.2.4/debian/changelog
--- vlc-2.2.4/debian/changelog	2016-06-05 14:08:56.000000000 +0000
+++ vlc-2.2.4/debian/changelog	2016-06-11 09:44:38.000000000 +0000
@@ -1,3 +1,13 @@
+vlc (2.2.4-2) unstable; urgency=medium
+
+  * Build ffmpeg without libopenjpeg (Closes: #826827)
+    - debian/control: Remove libopenjpeg-dev from B-D.
+    - debian/rules: Build ffmpeg with --disable-libopenjpeg.
+  * debian/rules: Revert workaround for zsh completion build failures on
+    powerpc. The underlying issue seems to be fixed.
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Sat, 11 Jun 2016 11:44:37 +0200
+
 vlc (2.2.4-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru vlc-2.2.4/debian/control vlc-2.2.4/debian/control
--- vlc-2.2.4/debian/control	2016-05-04 17:53:26.000000000 +0000
+++ vlc-2.2.4/debian/control	2016-06-11 09:27:19.000000000 +0000
@@ -127,7 +127,6 @@
                libgsm1-dev,
                liblzma-dev,
                libmp3lame-dev,
-               libopenjpeg-dev,
                librtmp-dev,
                libsnappy-dev,
                libsoxr-dev,
diff -Nru vlc-2.2.4/debian/rules vlc-2.2.4/debian/rules
--- vlc-2.2.4/debian/rules	2016-06-01 18:26:10.000000000 +0000
+++ vlc-2.2.4/debian/rules	2016-06-11 09:38:21.000000000 +0000
@@ -259,7 +259,6 @@
 # from ffmpeg 7:2.8.6-1 debian/rules and contrib/src/ffmpeg/rules.mak
 ffmpegflags += \
 	--enable-gpl \
-	--disable-decoder=libopenjpeg \
 	--disable-decoder=libschroedinger \
 	--enable-gnutls \
 	--disable-libass \
@@ -271,11 +270,11 @@
 	--disable-libfontconfig \
 	--disable-libfreetype \
 	--disable-libfribidi \
+	--disable-libopenjpeg \
 	--enable-libgme \
 	--enable-libgsm \
 	--enable-libmodplug \
 	--enable-libmp3lame \
-	--enable-libopenjpeg \
 	--enable-libopus \
 	--enable-librtmp \
 	--enable-libschroedinger \
@@ -349,12 +348,9 @@
 override_dh_auto_build:
 	dh_auto_build
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	# Build zsh completion and remove it if it fails.
-	# This is workaround until we find out why it fails on praetorius.
-	( \
-		BUILDDIR=$(CURDIR) \
-		cd extras/analyser && ./zsh_completion.sh \
-	) || rm -f extras/analyser/_zsh
+	# Build zsh completion
+	BUILDDIR=$(CURDIR) \
+	cd extras/analyser && ./zsh_completion.sh
 endif
 
 override_dh_auto_test:
@@ -399,9 +395,8 @@
 			echo warning: $$file depends on libX11 or libxcb; \
 		fi; \
 	done; \
-	# Install zsh completion if available
-	find extras/analyser/_vlc -exec \
-		dh_install -pvlc-nox '{}' usr/share/zsh/vendor-completions \;
+	# Install zsh completion
+	dh_install -pvlc-nox extras/analyser/_vlc usr/share/zsh/vendor-completions
 endif
 	$(if $(shell dpkg-vendor --is Ubuntu && echo true),dh_install -pvlc-nox debian/source_vlc.py usr/share/apport/package-hooks/)
 	dh_buildinfo -p vlc-nox