diff -Nru vdr-plugin-vcd-0.9/debian/changelog vdr-plugin-vcd-0.9/debian/changelog
--- vdr-plugin-vcd-0.9/debian/changelog	2014-10-31 14:01:03.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/changelog	2015-10-07 23:19:26.000000000 +0000
@@ -1,14 +1,24 @@
-vdr-plugin-vcd (0.9-22build2) vivid; urgency=medium
+vdr-plugin-vcd (0.9-25) unstable; urgency=medium
 
-  * Rebuild against vdr-abi-2.0.6-debian.
+  * Standards-Version: 3.9.6
+  * Added VDR 2.2.0 compatibility
+  * Added fix for VDR 2.1.3 API changes (Closes: #800952)
+  * Fixed references to new upstream location
 
- -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Oct 2014 14:01:03 +0000
+ -- Tobias Grimm <etobi@debian.org>  Thu, 08 Oct 2015 01:19:21 +0200
 
-vdr-plugin-vcd (0.9-22build1) saucy; urgency=low
+vdr-plugin-vcd (0.9-24) unstable; urgency=low
 
-  * Rebuild for vdr-abi-2.0.0-debian.
+  * Build-depend on vdr-dev (>= 1.7.40)
 
- -- Colin Watson <cjwatson@ubuntu.com>  Sun, 19 May 2013 23:37:26 +0100
+ -- Tobias Grimm <etobi@debian.org>  Sun, 10 Mar 2013 19:39:00 +0100
+
+vdr-plugin-vcd (0.9-23) unstable; urgency=low
+
+  * Use debhelper 9
+  * Build-depend on vdr-dev (>= 1.7.39)
+
+ -- Tobias Grimm <etobi@debian.org>  Tue, 05 Mar 2013 22:37:08 +0100
 
 vdr-plugin-vcd (0.9-22) unstable; urgency=low
 
diff -Nru vdr-plugin-vcd-0.9/debian/compat vdr-plugin-vcd-0.9/debian/compat
--- vdr-plugin-vcd-0.9/debian/compat	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/compat	2015-10-07 23:19:26.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru vdr-plugin-vcd-0.9/debian/control vdr-plugin-vcd-0.9/debian/control
--- vdr-plugin-vcd-0.9/debian/control	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/control	2015-10-07 23:19:26.000000000 +0000
@@ -3,9 +3,9 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <etobi@debian.org>, Thomas Günther <tom@toms-cafe.de>
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.28)
-Standards-Version: 3.9.3
-Homepage: http://www.heiligenmann.de/vdr/
+Build-Depends: debhelper (>= 9), vdr-dev (>= 2.2.0)
+Standards-Version: 3.9.6
+Homepage: http://www.vdr.heiligenmann.de/
 Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-vcd.git
 Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-vcd.git
 
diff -Nru vdr-plugin-vcd-0.9/debian/copyright vdr-plugin-vcd-0.9/debian/copyright
--- vdr-plugin-vcd-0.9/debian/copyright	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/copyright	2015-10-07 23:19:26.000000000 +0000
@@ -1,5 +1,5 @@
 Upstream Homepage:
-    http://www.heiligenmann.de/vdr/
+    http://www.vdr.heiligenmann.de/
 
 Upstream Author:
     Thomas Heiligenmann <thomas@heiligenmann.de>
diff -Nru vdr-plugin-vcd-0.9/debian/patches/series vdr-plugin-vcd-0.9/debian/patches/series
--- vdr-plugin-vcd-0.9/debian/patches/series	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/patches/series	2015-10-07 23:19:26.000000000 +0000
@@ -2,3 +2,4 @@
 90_vcd-0.9-1.7.3.patch
 91_vcd-0.9-fix-INCLUDES.patch
 vdr-1.7.27.patch
+vdr-vcd-0.9_devicetrickspeed.patch
diff -Nru vdr-plugin-vcd-0.9/debian/patches/vdr-vcd-0.9_devicetrickspeed.patch vdr-plugin-vcd-0.9/debian/patches/vdr-vcd-0.9_devicetrickspeed.patch
--- vdr-plugin-vcd-0.9/debian/patches/vdr-vcd-0.9_devicetrickspeed.patch	1970-01-01 00:00:00.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/patches/vdr-vcd-0.9_devicetrickspeed.patch	2015-10-07 23:19:26.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix for new vdr 2.1.3 API
+Author: Erich Seifert
+Origin: https://bugs.gentoo.org/show_bug.cgi?id=503452
+
+--- vcd-0.9/player.c	2008-01-16 13:26:38.000000000 +0100
++++ vcd-0.9/player.c	2014-03-04 22:07:39.374281971 +0100
+@@ -161,7 +161,11 @@
+      int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
+      if (sp > MAX_VIDEO_SLOWMOTION)
+         sp = MAX_VIDEO_SLOWMOTION;
++#if VDRVERSNUM >= 20103
++     DeviceTrickSpeed(sp,true);
++#else
+      DeviceTrickSpeed(sp);
++#endif
+   }
+ }
+
diff -Nru vdr-plugin-vcd-0.9/debian/rules vdr-plugin-vcd-0.9/debian/rules
--- vdr-plugin-vcd-0.9/debian/rules	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/rules	2015-10-07 23:19:26.000000000 +0000
@@ -4,9 +4,10 @@
 #export DH_VERBOSE=1
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
+CXXFLAGS += -fPIC $(LDFLAGS) $(CPPFLAGS)
 
 %:
-	dh $@
+	dh $@ --with vdrplugin
 
 override_dh_auto_build:
 	dh_auto_build -- all $(MAKE_OPTIONS)
@@ -14,7 +15,3 @@
 override_dh_auto_clean:
 	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -rf locale libvdr-*.so.*
-
-override_dh_gencontrol:
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
diff -Nru vdr-plugin-vcd-0.9/debian/watch vdr-plugin-vcd-0.9/debian/watch
--- vdr-plugin-vcd-0.9/debian/watch	2012-06-09 16:34:14.000000000 +0000
+++ vdr-plugin-vcd-0.9/debian/watch	2015-10-07 23:19:26.000000000 +0000
@@ -1,2 +1,2 @@
 version=2
-http://www.heiligenmann.de/vdr/download/vdr-vcd-(.*)\.tgz
+http://www.vdr.heiligenmann.de/download/vdr-vcd-(.*)\.tgz