diff --git a/README.md b/README.md
index 7d43a15..fc2a1e0 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,25 @@ consistency and thread safety. Bolt is currently used in high-load production
 environments serving databases as large as 1TB. Many companies such as
 Shopify and Heroku use Bolt-backed services every day.
 
+## A message from the author
+
+> The original goal of Bolt was to provide a simple pure Go key/value store and to
+> not bloat the code with extraneous features. To that end, the project has been
+> a success. However, this limited scope also means that the project is complete.
+> 
+> Maintaining an open source database requires an immense amount of time and energy.
+> Changes to the code can have unintended and sometimes catastrophic effects so
+> even simple changes require hours and hours of careful testing and validation.
+>
+> Unfortunately I no longer have the time or energy to continue this work. Bolt is
+> in a stable state and has years of successful production use. As such, I feel that
+> leaving it in its current state is the most prudent course of action.
+>
+> If you are interested in using a more featureful version of Bolt, I suggest that
+> you look at the CoreOS fork called [bbolt](https://github.com/coreos/bbolt).
+
+- Ben Johnson ([@benbjohnson](https://twitter.com/benbjohnson))
+
 ## Table of Contents
 
 - [Getting Started](#getting-started)
diff --git a/db.go b/db.go
index f352ff1..cc3596f 100644
--- a/db.go
+++ b/db.go
@@ -737,9 +737,7 @@ retry:
 
 		// pass success, or bolt internal errors, to all callers
 		for _, c := range b.calls {
-			if c.err != nil {
-				c.err <- err
-			}
+			c.err <- err
 		}
 		break retry
 	}
diff --git a/debian/changelog b/debian/changelog
index 2c37c20..a60f5a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-github-boltdb-bolt (1.3.1+git20180302.fd01fc7-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 26 Jan 2020 11:21:13 +0000
+
 golang-github-boltdb-bolt (1.3.1-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0002-Increase-write-waiting-time-when-testing.patch b/debian/patches/0002-Increase-write-waiting-time-when-testing.patch
index 072ea72..3ee190f 100644
--- a/debian/patches/0002-Increase-write-waiting-time-when-testing.patch
+++ b/debian/patches/0002-Increase-write-waiting-time-when-testing.patch
@@ -8,11 +8,11 @@ Bug-Debian: http://bugs.debian.org/832834
  db_test.go | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/db_test.go b/db_test.go
-index 1a67e84..0fb9dc7 100644
---- a/db_test.go
-+++ b/db_test.go
-@@ -412,7 +412,7 @@ func TestDB_Open_InitialMmapSize(t *testing.T) {
+Index: golang-github-boltdb-bolt/db_test.go
+===================================================================
+--- golang-github-boltdb-bolt.orig/db_test.go
++++ golang-github-boltdb-bolt/db_test.go
+@@ -412,7 +412,7 @@ func TestDB_Open_InitialMmapSize(t *test
  	}()
  
  	select {
diff --git a/debian/patches/0003-Add-support-for-mips-mips64.patch b/debian/patches/0003-Add-support-for-mips-mips64.patch
index b3df81c..c7d8ad6 100644
--- a/debian/patches/0003-Add-support-for-mips-mips64.patch
+++ b/debian/patches/0003-Add-support-for-mips-mips64.patch
@@ -12,11 +12,10 @@ Bug-Debian: http://bugs.debian.org/876461
  create mode 100644 bolt_mips64x.go
  create mode 100644 bolt_mipsx.go
 
-diff --git a/bolt_mips64x.go b/bolt_mips64x.go
-new file mode 100644
-index 0000000..134b578
+Index: golang-github-boltdb-bolt/bolt_mips64x.go
+===================================================================
 --- /dev/null
-+++ b/bolt_mips64x.go
++++ golang-github-boltdb-bolt/bolt_mips64x.go
 @@ -0,0 +1,12 @@
 +// +build mips64 mips64le
 +
@@ -30,11 +29,10 @@ index 0000000..134b578
 +
 +// Are unaligned load/stores broken on this arch?
 +var brokenUnaligned = false
-diff --git a/bolt_mipsx.go b/bolt_mipsx.go
-new file mode 100644
-index 0000000..d5ecb05
+Index: golang-github-boltdb-bolt/bolt_mipsx.go
+===================================================================
 --- /dev/null
-+++ b/bolt_mipsx.go
++++ golang-github-boltdb-bolt/bolt_mipsx.go
 @@ -0,0 +1,12 @@
 +// +build mips mipsle
 +
diff --git a/debian/patches/Bug#849663_Fix_32bit_failures.patch b/debian/patches/Bug#849663_Fix_32bit_failures.patch
index c3b4ee2..3f3701c 100644
--- a/debian/patches/Bug#849663_Fix_32bit_failures.patch
+++ b/debian/patches/Bug#849663_Fix_32bit_failures.patch
@@ -4,9 +4,11 @@ Author: Martín Ferrari <tincho@debian.org>
 Origin: vendor, 
 Bug: https://github.com/boltdb/bolt/issues/645
 Last-Update: 2017-01-06
---- a/db_test.go
-+++ b/db_test.go
-@@ -531,7 +531,7 @@
+Index: golang-github-boltdb-bolt/db_test.go
+===================================================================
+--- golang-github-boltdb-bolt.orig/db_test.go
++++ golang-github-boltdb-bolt/db_test.go
+@@ -370,7 +370,7 @@ func TestDB_Open_InitialMmapSize(t *test
  	path := tempfile()
  	defer os.Remove(path)
  
diff --git a/tx.go b/tx.go
index 6700308..bbb60ac 100644
--- a/tx.go
+++ b/tx.go
@@ -291,7 +291,9 @@ func (tx *Tx) close() {
 }
 
 // Copy writes the entire database to a writer.
-// This function exists for backwards compatibility. Use WriteTo() instead.
+// This function exists for backwards compatibility.
+//
+// Deprecated; Use WriteTo() instead.
 func (tx *Tx) Copy(w io.Writer) error {
 	_, err := tx.WriteTo(w)
 	return err