diff -Nru gmpc-plugins-11.8.16/debian/changelog gmpc-plugins-11.8.16/debian/changelog
--- gmpc-plugins-11.8.16/debian/changelog	2013-10-13 10:15:40.000000000 -0400
+++ gmpc-plugins-11.8.16/debian/changelog	2016-04-13 16:05:25.000000000 -0400
@@ -1,3 +1,11 @@
+gmpc-plugins (11.8.16-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Disable Jamendo build to fix FTBFS (Closes: #807735)
+  * shout plugin should kill with TERM instead of HUP" (Closes: #820908)
+
+ -- Antoine Beaupré <anarcat@debian.org>  Wed, 13 Apr 2016 11:47:21 -0400
+
 gmpc-plugins (11.8.16-2) unstable; urgency=low
 
   * Disable LyricWiki plugin (Closes: #539821)
diff -Nru gmpc-plugins-11.8.16/debian/patches/kill-term.patch gmpc-plugins-11.8.16/debian/patches/kill-term.patch
--- gmpc-plugins-11.8.16/debian/patches/kill-term.patch	1969-12-31 19:00:00.000000000 -0500
+++ gmpc-plugins-11.8.16/debian/patches/kill-term.patch	2016-04-13 16:05:25.000000000 -0400
@@ -0,0 +1,24 @@
+Description: kill streaming process with SIGTERM
+
+ ogg123 doesn't stop when sent SIGHUP. this is probably so that you
+ can start music in a terminal and keep it running when the terminal
+ is closed, so it makes sense to me. unfortunately, the shout plugin
+ sends SIGHUP when the player is stopped, so ogg123 keeps on
+ going. many users probably don't notice the issue because, logically,
+ the stream itself should stop working and then ogg123 will terminate,
+ but some streams have a fallback configured, which plays the same
+ track over and over again.
+ 
+Author: Antoine Beaupré
+
+--- gmpc-plugins-11.8.16.orig/gmpc-shout/src/plugin.c
++++ gmpc-plugins-11.8.16/gmpc-shout/src/plugin.c
+@@ -301,7 +301,7 @@ static void stop_ogg123(void)
+ 	{
+ #ifndef __WIN32__
+ 		printf("killing: %i\n", ogg123_pid);
+-		kill (ogg123_pid, SIGHUP);
++		kill (ogg123_pid, SIGTERM);
+ #else
+ 		TerminateProcess (ogg123_pid, 1);
+ #endif
diff -Nru gmpc-plugins-11.8.16/debian/patches/series gmpc-plugins-11.8.16/debian/patches/series
--- gmpc-plugins-11.8.16/debian/patches/series	2013-10-13 10:14:11.000000000 -0400
+++ gmpc-plugins-11.8.16/debian/patches/series	2016-04-13 16:05:25.000000000 -0400
@@ -1 +1,2 @@
 0001-Fix-typo-Psychadelic-Psychedelic.patch
+kill-term.patch
diff -Nru gmpc-plugins-11.8.16/debian/rules gmpc-plugins-11.8.16/debian/rules
--- gmpc-plugins-11.8.16/debian/rules	2013-10-13 10:14:11.000000000 -0400
+++ gmpc-plugins-11.8.16/debian/rules	2016-04-13 16:05:25.000000000 -0400
@@ -9,7 +9,12 @@
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-lyricwiki
+	dh_auto_configure -- \
+		--disable-lyricwiki \
+		--disable-jamendo \
+		--disable-magnatune \
+		--disable-tagedit \
+		--disable-albumview
 
 override_dh_strip:
 	dh_strip $(DEB_DH_STRIP_ARGS)