diff --git a/debian/README b/debian/README
index 654ba44c..3f514d5b 100644
--- a/debian/README
+++ b/debian/README
@@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch.
 The easiest way to get all branches is probably to have one
 clone per version:
 
-for f in 14 15 16 snapshot; do
+for f in 14 15 16 17 snapshot; do
     git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
 done
 
diff --git a/debian/changelog b/debian/changelog
index ae33213b..f46ba603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
+llvm-toolchain-17 (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium
 
   * Fix for real the libclang-rt-17-dev issue
 
diff --git a/debian/control b/debian/control
index 2e673c74..32437dc5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: llvm-toolchain-snapshot
+Source: llvm-toolchain-17
 Section: devel
 Priority: optional
 Rules-Requires-Root: no
@@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
 Build-Conflicts: oprofile
 Standards-Version: 4.6.2
 Homepage: https://www.llvm.org/
-Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
-Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 17
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17
 
 # ------------- clang -------------
 
@@ -562,7 +562,7 @@ Description: LLVM-based linker, header files
 Package: lldb-17
 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}),
  python3-lldb-17
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index 189482ad..69dcd4c8 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
-ORIG_VERSION=15
-TARGET_VERSION=16
-ORIG_VERSION_2=15_0
-TARGET_VERSION_2=16_0
-ORIG_VERSION_3=150
-TARGET_VERSION_3=160
+ORIG_VERSION=16
+TARGET_VERSION=17
+ORIG_VERSION_2=16_0
+TARGET_VERSION_2=17_0
+ORIG_VERSION_3=160
+TARGET_VERSION_3=170
 
 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff`
 for F in $LIST; do
diff --git a/debian/rules b/debian/rules
index 12876980..ac0a301e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1002,7 +1002,7 @@ endif
 		echo "Generating manpage of $$f"; \
 		LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \
 	done
-	# Create the following directory regardless as libomp-16-doc
+	# Create the following directory regardless as libomp-XX-doc
 	# is Architecture: all
 	mkdir -p openmp/runtime/doc/doxygen/generated/html/