diff -Nru linphone-3.6.1/debian/changelog linphone-3.6.1/debian/changelog
--- linphone-3.6.1/debian/changelog	2018-02-27 13:50:52.000000000 +0000
+++ linphone-3.6.1/debian/changelog	2018-06-20 17:46:03.000000000 +0000
@@ -1,8 +1,14 @@
-linphone (3.6.1-3build1) bionic; urgency=medium
+linphone (3.6.1-4) unstable; urgency=medium
 
-  * No-change rebuild against latest libvpx
+  * Team upload fixing some issues in sid while waiting for the
+    transition of the new major version.
+  * Switch Vcs-URLs to salsa.d.o (Closes: #855421)
+  * Update Build-Depends: xxd moved from vim-common to xxd. (Closes: #887381)
+  * Update d/watch to new github location
+  * Fix FTBFS with FFmpeg 4.0.
+    Thanks to James Cowgill (Closes: #888349)
 
- -- Jeremy Bicha <jbicha@ubuntu.com>  Tue, 27 Feb 2018 08:50:52 -0500
+ -- Bernhard Schmidt <berni@debian.org>  Wed, 20 Jun 2018 19:46:03 +0200
 
 linphone (3.6.1-3) unstable; urgency=medium
 
diff -Nru linphone-3.6.1/debian/control linphone-3.6.1/debian/control
--- linphone-3.6.1/debian/control	2016-11-16 07:29:53.000000000 +0000
+++ linphone-3.6.1/debian/control	2018-06-20 17:46:03.000000000 +0000
@@ -55,7 +55,7 @@
                mesa-common-dev,
                pkg-config,
                sgmltools-lite,
-               vim-common
+               xxd,
 # Requires updated libsrtp-dev
 # libsrtp-dev [!hurd-any !sparc], libzrtpcpp-dev (>= 2.1),
 #
@@ -63,8 +63,8 @@
 # libssl-dev,
 Standards-Version: 3.9.6
 Homepage: http://www.linphone.org/
-Vcs-Git: https://anonscm.debian.org/git/pkg-voip/linphone.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-voip/asterisk.git
+Vcs-Browser: https://salsa.debian.org/pkg-voip-team/linphone
+Vcs-Git: https://salsa.debian.org/pkg-voip-team/linphone.git
 
 Package: linphone
 Architecture: any
diff -Nru linphone-3.6.1/debian/patches/ffmpeg_4.0.patch linphone-3.6.1/debian/patches/ffmpeg_4.0.patch
--- linphone-3.6.1/debian/patches/ffmpeg_4.0.patch	1970-01-01 00:00:00.000000000 +0000
+++ linphone-3.6.1/debian/patches/ffmpeg_4.0.patch	2018-06-20 17:46:03.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/888349
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/mediastreamer2/src/videofilters/nowebcam.c
++++ b/mediastreamer2/src/videofilters/nowebcam.c
+@@ -1749,7 +1749,7 @@ mblk_t *ms_load_jpeg_as_yuv(const char *
+ 			m=ms_load_generate_yuv(reqsize);
+ 			return m;
+ 		}
+-		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + FF_INPUT_BUFFER_PADDING_SIZE);
++		jpgbuf=(uint8_t*)ms_malloc0(statbuf.st_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ 		if (jpgbuf==NULL)
+ 		{
+ 			close(fd);
diff -Nru linphone-3.6.1/debian/patches/series linphone-3.6.1/debian/patches/series
--- linphone-3.6.1/debian/patches/series	2016-11-16 06:58:33.000000000 +0000
+++ linphone-3.6.1/debian/patches/series	2018-06-20 17:46:03.000000000 +0000
@@ -8,5 +8,6 @@
 libav10.patch
 libav11.patch
 ffmpeg_2.9.patch
+ffmpeg_4.0.patch
 wizard-relax-domain.patch
 wizard-relax-username.patch
diff -Nru linphone-3.6.1/debian/watch linphone-3.6.1/debian/watch
--- linphone-3.6.1/debian/watch	2016-11-16 06:58:25.000000000 +0000
+++ linphone-3.6.1/debian/watch	2018-06-20 17:46:03.000000000 +0000
@@ -1,3 +1,3 @@
-version=3
-
-http://download.savannah.gnu.org/releases-noredirect/linphone/stable/sources/ linphone-([\d\.]+).tar.gz debian svn-upgrade
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/linphone-$1\.tar\.gz/ \
+  https://github.com/BelledonneCommunications/linphone/tags .*/v?(\d\S+)\.tar\.gz