diff -Nru openssl-1.1.0g/debian/changelog openssl-1.1.0g/debian/changelog
--- openssl-1.1.0g/debian/changelog	2018-03-27 17:45:15.000000000 +0000
+++ openssl-1.1.0g/debian/changelog	2018-04-25 17:03:48.000000000 +0000
@@ -1,3 +1,10 @@
+openssl (1.1.0g-2ubuntu4) bionic; urgency=medium
+
+  * debian/patches/rehash-pass-on-dupes.patch: Don't return 1 when a duplicate
+    certificate is found. (LP: #1764848)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 25 Apr 2018 10:03:48 -0700
+
 openssl (1.1.0g-2ubuntu3) bionic; urgency=medium
 
   * SECURITY UPDATE: overflow bug in AVX2 Montgomery multiplication
diff -Nru openssl-1.1.0g/debian/patches/rehash-pass-on-dupes.patch openssl-1.1.0g/debian/patches/rehash-pass-on-dupes.patch
--- openssl-1.1.0g/debian/patches/rehash-pass-on-dupes.patch	1970-01-01 00:00:00.000000000 +0000
+++ openssl-1.1.0g/debian/patches/rehash-pass-on-dupes.patch	2018-04-25 17:03:48.000000000 +0000
@@ -0,0 +1,22 @@
+Description: return 0 on a duplicate certificate
+ Modify openssl rehash so it returns 0 on a duplicate certificate like c_rehash does.
+Author: Brian Murray <brian@ubuntu.com>
+Origin: vendor
+Bug: https://github.com/openssl/openssl/issues/6083
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openssl/+bug/1764848
+Last-Update: 2018-04-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: openssl-1.1.0g/apps/rehash.c
+===================================================================
+--- openssl-1.1.0g.orig/apps/rehash.c
++++ openssl-1.1.0g/apps/rehash.c
+@@ -132,7 +132,7 @@ static int add_entry(enum Type type, uns
+             BIO_printf(bio_err,
+                        "%s: skipping duplicate %s in %s\n", opt_getprog(),
+                        type == TYPE_CERT ? "certificate" : "CRL", filename);
+-            return 1;
++            return 0;
+         }
+         if (strcmp(filename, ep->filename) == 0) {
+             found = ep;
diff -Nru openssl-1.1.0g/debian/patches/series openssl-1.1.0g/debian/patches/series
--- openssl-1.1.0g/debian/patches/series	2018-03-27 17:45:12.000000000 +0000
+++ openssl-1.1.0g/debian/patches/series	2018-04-25 17:03:13.000000000 +0000
@@ -16,3 +16,4 @@
 96530eea93d27e536f4e93956256cf8dcda7d469.patch
 CVE-2017-3738.patch
 CVE-2018-0739.patch
+rehash-pass-on-dupes.patch