diff -Nru vsftpd-3.0.3/debian/changelog vsftpd-3.0.3/debian/changelog
--- vsftpd-3.0.3/debian/changelog	2016-02-12 15:13:26.000000000 +0000
+++ vsftpd-3.0.3/debian/changelog	2016-04-13 08:30:25.000000000 +0000
@@ -1,3 +1,11 @@
+vsftpd (3.0.3-3ubuntu2) xenial; urgency=medium
+
+  * Revert debian/patches/0013-listen.patch: In vsftpd.conf, set
+    listen_ipv6=NO. This fix introduces a regression, FTBS and goes against the
+    debian policy.
+
+ -- Louis Bouchard <louis.bouchard@ubuntu.com>  Wed, 13 Apr 2016 09:29:50 +0100
+
 vsftpd (3.0.3-3ubuntu1) xenial; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru vsftpd-3.0.3/debian/patches/0013-listen.patch vsftpd-3.0.3/debian/patches/0013-listen.patch
--- vsftpd-3.0.3/debian/patches/0013-listen.patch	2016-02-10 23:47:35.000000000 +0000
+++ vsftpd-3.0.3/debian/patches/0013-listen.patch	2016-04-12 15:10:09.000000000 +0000
@@ -1,9 +1,8 @@
 Author: Jiri Skala <jskala@redhat.com>
 Description: removes exclusivity between listen and listen_ipv6 BZ#450853
 
-diff -Naurp vsftpd.orig/vsftpd.conf vsftpd/vsftpd.conf
---- vsftpd.orig/vsftpd.conf
-+++ vsftpd/vsftpd.conf
+--- a/vsftpd.conf
++++ b/vsftpd.conf
 @@ -11,13 +11,15 @@
  #
  # Run standalone?  vsftpd can run either from an inetd or as a standalone
@@ -22,14 +21,13 @@
 +# sockets. If you want that (perhaps because you want to listen on specific
 +# addresses) then you must run two copies of vsftpd with two configuration
 +# files.
-+listen_ipv6=NO
++listen_ipv6=YES
  #
  # Allow anonymous FTP? (Beware - allowed by default if you comment this out).
  anonymous_enable=YES
-diff -Naurp vsftpd.orig/vsftpd.conf.5 vsftpd/vsftpd.conf.5
---- vsftpd.orig/vsftpd.conf.5
-+++ vsftpd/vsftpd.conf.5
-@@ -281,8 +281,9 @@ Default: NO
+--- a/vsftpd.conf.5
++++ b/vsftpd.conf.5
+@@ -281,8 +281,9 @@
  .TP
  .B listen_ipv6
  Like the listen parameter, except vsftpd will listen on an IPv6 socket instead
diff -Nru vsftpd-3.0.3/debian/patches/0040-disable-anonymous.patch vsftpd-3.0.3/debian/patches/0040-disable-anonymous.patch
--- vsftpd-3.0.3/debian/patches/0040-disable-anonymous.patch	2016-02-10 23:47:35.000000000 +0000
+++ vsftpd-3.0.3/debian/patches/0040-disable-anonymous.patch	2016-04-12 15:10:19.000000000 +0000
@@ -4,13 +4,11 @@
 Last-Update: 2014-10-05
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/vsftpd.conf
-===================================================================
---- trunk.orig/vsftpd.conf
-+++ trunk/vsftpd.conf
-@@ -21,11 +21,11 @@ listen=NO
+--- a/vsftpd.conf
++++ b/vsftpd.conf
+@@ -21,11 +21,11 @@
  # files.
- listen_ipv6=NO
+ listen_ipv6=YES
  #
 -# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
 -anonymous_enable=YES
@@ -23,11 +21,9 @@
  #
  # Uncomment this to enable any form of FTP write command.
  #write_enable=YES
-Index: trunk/vsftpd.conf.5
-===================================================================
---- trunk.orig/vsftpd.conf.5
-+++ trunk/vsftpd.conf.5
-@@ -84,7 +84,7 @@ and
+--- a/vsftpd.conf.5
++++ b/vsftpd.conf.5
+@@ -84,7 +84,7 @@
  .BR anonymous
  are recognised as anonymous logins.
  
@@ -36,10 +32,8 @@
  .TP
  .B ascii_download_enable
  When enabled, ASCII mode data transfers will be honoured on downloads.
-Index: trunk/EXAMPLE/INTERNET_SITE/vsftpd.conf
-===================================================================
---- trunk.orig/EXAMPLE/INTERNET_SITE/vsftpd.conf
-+++ trunk/EXAMPLE/INTERNET_SITE/vsftpd.conf
+--- a/EXAMPLE/INTERNET_SITE/vsftpd.conf
++++ b/EXAMPLE/INTERNET_SITE/vsftpd.conf
 @@ -1,5 +1,5 @@
  # Access rights
 -anonymous_enable=YES
@@ -47,11 +41,9 @@
  local_enable=NO
  write_enable=NO
  anon_upload_enable=NO
-Index: trunk/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
-===================================================================
---- trunk.orig/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
-+++ trunk/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
-@@ -3,7 +3,7 @@ listen=YES
+--- a/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
++++ b/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf
+@@ -3,7 +3,7 @@
  max_clients=200
  max_per_ip=4
  # Access rights