diff --git a/debian/changelog b/debian/changelog
index 064355237e3647f6bbcfc378aeaf60ae54c9246d..2e9506edb68fbd8febefdab4e27ae5db805670b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+golang-github-go-redis-redis (8.11.5-1) UNRELEASED; urgency=medium
+
+  * Team upload
+  * Update to last v8 upstream release
+    - Rebase patch
+  * d/control:
+    - Update Section to golang
+    - Update Maintainer email address to current Go Team email
+    - Update Build-Depends and Depends
+    - Bump Standards-Version to 4.6.2 (no changes needed)
+    - Add Rules-Requires-Root: no
+    - Mark golang-github-go-redis-redis-dev as Multi-Arch: foreign
+  * d/copyright:
+    - Remove unneeded Files-Excluded
+    - Update copyright information for added/removed files
+  * Add DH_GOLANG_INSTALL_EXTRA and DH_GOLANG_EXCLUDES to d/rules
+  * Update d/watch
+
+ -- Mathias Gibbens <gibmat@debian.org>  Mon, 16 Oct 2023 23:07:10 +0000
+
 golang-github-go-redis-redis (6.15.0-2) unstable; urgency=medium
 
   [ Nobuhiro Iwamatsu ]
diff --git a/debian/control b/debian/control
index a8f38813c8f63f6f8ba7509fc3f2447c370725a3..a2b31fbafa753b9322ee96692fbafc134a0f7674 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,37 @@
 Source: golang-github-go-redis-redis
-Section: devel
+Section: golang
 Priority: optional
-Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: Christos Trochalakis <ctrochalakis@debian.org>,
            Michael Hudson-Doyle <mwhudson@debian.org>
 Build-Depends: debhelper-compat (= 13),
                dh-golang,
                golang-any,
+               golang-github-cespare-xxhash-dev,
+               golang-github-dgryski-go-rendezvous-dev,
                golang-ginkgo-dev,
                golang-gomega-dev,
+               golang-go.opencensus-dev,
+               golang-opentelemetry-otel-dev,
                redis-server
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
 Homepage: https://github.com/go-redis/redis
 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-go-redis-redis
 Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-go-redis-redis.git
+Rules-Requires-Root: no
 XS-Go-Import-Path: github.com/go-redis/redis
 Testsuite: autopkgtest-pkg-go
 
 Package: golang-github-go-redis-redis-dev
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         golang-github-cespare-xxhash-dev,
+         golang-github-dgryski-go-rendezvous-dev,
          golang-ginkgo-dev,
-         golang-gomega-dev
+         golang-gomega-dev,
+         golang-go.opencensus-dev,
+         golang-opentelemetry-otel-dev
 Description: Type safe Redis client for Go
  Go Redis supports:
  .
diff --git a/debian/copyright b/debian/copyright
index de9acf04e44128159c5a318f170cac4dfd153fb9..9ab3c4fa53f93864aeae1d9a3f3cd50de17d9ef4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,17 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: go-redis
 Source: https://github.com/go-redis/redis
-Files-Excluded: vendor Godeps/_workspace
 
 Files: *
 Copyright: 2012 - 2017 Go Redis authors
 License: BSD-2-clause
 
-Files: internal/consistenthash/*
-Copyright: 2013 Google Inc.
-License: Apache-2.0
+Files: internal/hashtag/hashtag.go
+Copyright:
+ 2001-2010 Georges Menie
+ 2013 The Go Authors
+License: BSD-3-clause
+Comment: From https://redis.io/docs/reference/cluster-spec/#appendix-a-crc16-reference-implementation-in-ansi-c, it appears the original C code was licensed under the BSD-3-clause
 
 Files: internal/once.go
 Copyright: 2014 The Camlistore Authors
@@ -45,6 +47,32 @@ License: BSD-2-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+     * Neither the name of the University of California, Berkeley nor the
+       names of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: Apache-2.0
  On Debian systems, the full text of the Apache
  License version 2.0 can be found in the file
diff --git a/debian/patches/0001-test-Autopkgtest-support.patch b/debian/patches/0001-test-Autopkgtest-support.patch
index 6d6499f223d34c5f2e3270a7143aac775140e2a8..59cec5ba445c7549496fb2a86534600b21e67a14 100644
--- a/debian/patches/0001-test-Autopkgtest-support.patch
+++ b/debian/patches/0001-test-Autopkgtest-support.patch
@@ -9,22 +9,22 @@ Subject: test: Autopkgtest support
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/main_test.go b/main_test.go
-index 30f09c6..8e6587c 100644
+index 5414310..3af7df4 100644
 --- a/main_test.go
 +++ b/main_test.go
-@@ -247,12 +247,17 @@ func (p *redisProcess) Close() error {
+@@ -283,12 +283,17 @@ func (p *redisProcess) Close() error {
  }
  
  var (
 -	redisServerBin, _  = filepath.Abs(filepath.Join("testdata", "redis", "src", "redis-server"))
--	redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis.conf"))
+-	redisServerConf, _ = filepath.Abs(filepath.Join("testdata", "redis", "redis.conf"))
 +	autopkgtestTmp       = os.Getenv("AUTOPKGTEST_TMP")
 +	autopkgtestArtifacts = os.Getenv("AUTOPKGTEST_ARTIFACTS")
 +)
 +
 +var (
 +	redisServerBin     = "/usr/bin/redis-server"
-+	redisServerConf, _ = filepath.Abs(filepath.Join(autopkgtestTmp, "testdata", "redis.conf"))
++	redisServerConf, _ = filepath.Abs(filepath.Join(autopkgtestTmp, "testdata", "redis", "redis.conf"))
  )
  
  func redisDir(port string) (string, error) {
diff --git a/debian/rules b/debian/rules
index e72b9999ca45c4b3497f50427d61e4dc025a05e2..d359b9698bb04666542171b23892255926eee007 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+# These source files aren't automatically included
+export DH_GOLANG_INSTALL_EXTRA := extra/
+
+# Don't build the examples
+export DH_GOLANG_EXCLUDES := example/
+
 # Disabling tests during build as they require a redis instance.
 # We will test using autopkgtests only.
 override_dh_auto_test:
diff --git a/debian/watch b/debian/watch
index dc754e5c07c9ba0e1552a3a867a6e865f9b0e6b8..7f732387feb20bf59a18bbc5dba71047bcd26152 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-version=3
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/golang-github-go-redis-redis-\$1\.tar\.gz/,\
-uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/\$1~\$2\$3/ \
-  https://github.com/go-redis/redis/tags .*/v?(\d\S*)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,\
+      uversionmangle=s/(\d)[_\.\-\+]?(RC|rc|pre|dev|beta|alpha)[.]?(\d*)$/$1~$2$3/" \
+  https://github.com/go-redis/redis/tags .*/v?(\d\S*)\.tar\.gz debian