diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/changelog erlang-cuttlefish-2.0.11+dfsg/debian/changelog
--- erlang-cuttlefish-2.0.11+dfsg/debian/changelog	2017-07-01 20:16:16.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/changelog	2017-08-18 18:11:02.000000000 +0000
@@ -1,3 +1,12 @@
+erlang-cuttlefish (2.0.11+dfsg-2) unstable; urgency=medium
+
+  * Fix build with OTP 20. (Closes: #871350)
+    - Update patches/support_otp_19.
+    - Add patches/remove-warnings_as_errors.
+  * Bump Standards-Version to 4.0.0.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sat, 19 Aug 2017 03:11:02 +0900
+
 erlang-cuttlefish (2.0.11+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/control erlang-cuttlefish-2.0.11+dfsg/debian/control
--- erlang-cuttlefish-2.0.11+dfsg/debian/control	2017-07-01 20:16:16.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/control	2017-08-18 18:11:02.000000000 +0000
@@ -4,7 +4,6 @@
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dpkg-dev,
                erlang-dev (>= 1:16),
                erlang-eunit,
                erlang-mnesia,
@@ -13,7 +12,7 @@
                erlang-getopt,
                erlang-lager (>= 3.2.4),
                erlang-neotoma (>= 1.7.4)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-leofs/erlang-cuttlefish.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-leofs/erlang-cuttlefish.git
 Homepage: https://github.com/basho/cuttlefish
diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/patches/remove-warnings_as_errors erlang-cuttlefish-2.0.11+dfsg/debian/patches/remove-warnings_as_errors
--- erlang-cuttlefish-2.0.11+dfsg/debian/patches/remove-warnings_as_errors	1970-01-01 00:00:00.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/patches/remove-warnings_as_errors	2017-08-18 18:11:02.000000000 +0000
@@ -0,0 +1,22 @@
+Description: Remove warnings_as_errors from erl_opts
+ Fix ftbfs with following error:
+Compiling src/cuttlefish_unit.erl failed:
+DEBUG: Worker compilation failed: {{error,
+  {error,[],
+    [["src/cuttlefish_unit.erl:4: export_all flag enabled - all functions will be exported\n"]]}},
+    {source,"src/cuttlefish_unit.erl"}}
+Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
+Last-Update: 2017-08-19
+
+diff --git a/rebar.config b/rebar.config
+index e7d9835..abaa3ce 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -1,6 +1,6 @@
+ {require_otp_vsn, "R16|17|18|19|20"}.
+ 
+-{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
++{erl_opts, [{parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
+ 
+ {eunit_opts, [verbose]}.
+ {cover_enabled, true}.
diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/patches/series erlang-cuttlefish-2.0.11+dfsg/debian/patches/series
--- erlang-cuttlefish-2.0.11+dfsg/debian/patches/series	2017-05-31 08:07:53.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/patches/series	2017-08-18 18:11:02.000000000 +0000
@@ -1,4 +1,5 @@
 remove_dep
 fix_rebar_path
 fix_version_string
-support_otp_19
+support_otp_20
+remove-warnings_as_errors
diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_19 erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_19
--- erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_19	2017-05-31 08:07:53.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_19	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-diff --git a/rebar.config b/rebar.config
-index ad61941..4ac69cd 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -1,4 +1,4 @@
--{require_otp_vsn, "R16|17|18"}.
-+{require_otp_vsn, "R16|17|18|19"}.
- 
- {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
- 
diff -Nru erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_20 erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_20
--- erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_20	1970-01-01 00:00:00.000000000 +0000
+++ erlang-cuttlefish-2.0.11+dfsg/debian/patches/support_otp_20	2017-08-18 18:10:24.000000000 +0000
@@ -0,0 +1,10 @@
+diff --git a/rebar.config b/rebar.config
+index ad61941..4ac69cd 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -1,4 +1,4 @@
+-{require_otp_vsn, "R16|17|18"}.
++{require_otp_vsn, "R16|17|18|19|20"}.
+ 
+ {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}, debug_info, warn_untyped_record]}.
+