diff --git a/debian/changelog b/debian/changelog
index be8a0ae235fefa6934318fd6a57fea00e112828d..a8b8dd6a2e78d0395ed93374f0d9bcfffc0e4335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 ruby-json-schema (2.8.1-2) UNRELEASED; urgency=medium
 
+  * Team upload
+  [ Utkarsh Gupta ]
   * Add salsa-ci.yml
 
- -- Utkarsh Gupta <guptautkarsh2102@gmail.com>  Tue, 13 Aug 2019 05:51:09 +0530
+  [ Cédric Boutillier ]
+  * Add patch to provide ruby 2.6+ support by rescueing new exception on
+    invalid IP address (Closes: #952019)
+
+ -- Cédric Boutillier <boutil@debian.org>  Fri, 28 Feb 2020 10:23:12 +0100
 
 ruby-json-schema (2.8.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/ruby27_support.patch b/debian/patches/ruby27_support.patch
new file mode 100644
index 0000000000000000000000000000000000000000..73564de0cc024ae5b2be3f219df71611963fec1d
--- /dev/null
+++ b/debian/patches/ruby27_support.patch
@@ -0,0 +1,26 @@
+Origin: https://github.com/ruby-json-schema/json-schema/commit/4ed4025e418ced4c207580b855d173ee3c99509c.patch
+Forwarded: https://github.com/ruby-json-schema/json-schema/pull/437
+Bug: https://github.com/ruby-json-schema/json-schema/issues/430
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=952019
+From: Luke Rodgers <lukeasrodgers@gmail.com>
+Date: Sun, 26 May 2019 21:45:45 -0400
+Subject: [PATCH] Rescue IPAddr::InvalidAddressError
+
+As of ruby 2.6 the error raise here includes a string with the offending
+IP in it, which causes the matching to fail. We could just ditch string
+matching altogether except for 1.9.3 support, which raises a generic
+ArugmentError.
+---
+ lib/json-schema/attributes/formats/ip.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/json-schema/attributes/formats/ip.rb
++++ b/lib/json-schema/attributes/formats/ip.rb
+@@ -10,6 +10,7 @@
+ 
+         begin
+           ip = IPAddr.new(data)
++        rescue IPAddr::InvalidAddressError
+         rescue ArgumentError => e
+           raise e unless e.message == 'invalid address'
+         end
diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..263d141307c05f9f3a9df45a14b0a08e6f93eb91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ruby27_support.patch