diff --git a/CHANGELOG.md b/CHANGELOG.md
index e26997dc..fb8d29d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## master (unreleased)
 
+## 1.6.17 (2024-06-20)
+
+- fix: apply local extends only if they are present ([#754](https://github.com/evilmartians/lefthook/pull/754)) by @mrexox
+- chore: setting proper error message for missing lefthook file ([#748](https://github.com/evilmartians/lefthook/pull/748)) by @Cadienvan
+
 ## 1.6.16 (2024-06-13)
 
 - fix: skip overwriting hooks when fetching data from remotes ([#745](https://github.com/evilmartians/lefthook/pull/745)) by @mrexox
diff --git a/docs/install.md b/docs/install.md
index 1147f046..f6d1b729 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -78,7 +78,7 @@ You can find the Swift wrapper plugin [here](https://github.com/csjones/lefthook
 Utilize lefthook in your Swift project using Swift Package Manager:
 
 ```swift
-.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.16"),
+.package(url: "https://github.com/csjones/lefthook-plugin.git", exact: "1.6.17"),
 ```
 
 Or, with [mint](https://github.com/yonaskolb/Mint):
diff --git a/internal/version/version.go b/internal/version/version.go
index 5d1dd72a..84f1ee4a 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 )
 
-const version = "1.6.16"
+const version = "1.6.17"
 
 var (
 	// Is set via -X github.com/evilmartians/lefthook/internal/version.commit={commit}.
diff --git a/packaging/Makefile b/packaging/Makefile
index 010167ec..26c4e247 100644
--- a/packaging/Makefile
+++ b/packaging/Makefile
@@ -1,5 +1,5 @@
 # Packages version to release
-VERSION := 1.6.16
+VERSION := 1.6.17
 
 DIST_DIR := ../dist
 
diff --git a/packaging/npm-bundled/package.json b/packaging/npm-bundled/package.json
index d189492b..4be04c2a 100644
--- a/packaging/npm-bundled/package.json
+++ b/packaging/npm-bundled/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evilmartians/lefthook",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "Simple git hooks manager",
   "main": "index.js",
   "bin": {
diff --git a/packaging/npm-installer/package.json b/packaging/npm-installer/package.json
index d3ae869b..59376635 100644
--- a/packaging/npm-installer/package.json
+++ b/packaging/npm-installer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evilmartians/lefthook-installer",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "Simple git hooks manager",
   "main": "index.js",
   "bin": {
diff --git a/packaging/npm/lefthook-darwin-arm64/package.json b/packaging/npm/lefthook-darwin-arm64/package.json
index 8ecec409..e898e7ef 100644
--- a/packaging/npm/lefthook-darwin-arm64/package.json
+++ b/packaging/npm/lefthook-darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-darwin-arm64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The macOS ARM 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-darwin-x64/package.json b/packaging/npm/lefthook-darwin-x64/package.json
index c4908f17..fdc5b5de 100644
--- a/packaging/npm/lefthook-darwin-x64/package.json
+++ b/packaging/npm/lefthook-darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-darwin-x64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The macOS 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-freebsd-arm64/package.json b/packaging/npm/lefthook-freebsd-arm64/package.json
index 111af8eb..32afe924 100644
--- a/packaging/npm/lefthook-freebsd-arm64/package.json
+++ b/packaging/npm/lefthook-freebsd-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-freebsd-arm64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The FreeBSD ARM 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-freebsd-x64/package.json b/packaging/npm/lefthook-freebsd-x64/package.json
index b9c8e24d..9451298e 100644
--- a/packaging/npm/lefthook-freebsd-x64/package.json
+++ b/packaging/npm/lefthook-freebsd-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-freebsd-x64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The FreeBSD 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-linux-arm64/package.json b/packaging/npm/lefthook-linux-arm64/package.json
index cb176919..c348bdaf 100644
--- a/packaging/npm/lefthook-linux-arm64/package.json
+++ b/packaging/npm/lefthook-linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-linux-arm64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The Linux ARM 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-linux-x64/package.json b/packaging/npm/lefthook-linux-x64/package.json
index 3dd36e9d..0dba45cb 100644
--- a/packaging/npm/lefthook-linux-x64/package.json
+++ b/packaging/npm/lefthook-linux-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-linux-x64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The Linux 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-windows-arm64/package.json b/packaging/npm/lefthook-windows-arm64/package.json
index 0ceef7a4..9d1aeb8e 100644
--- a/packaging/npm/lefthook-windows-arm64/package.json
+++ b/packaging/npm/lefthook-windows-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-windows-arm64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The Windows ARM 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook-windows-x64/package.json b/packaging/npm/lefthook-windows-x64/package.json
index ceadcefb..93a8a644 100644
--- a/packaging/npm/lefthook-windows-x64/package.json
+++ b/packaging/npm/lefthook-windows-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook-windows-x64",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "The Windows 64-bit binary for lefthook, git hooks manager.",
   "preferUnplugged": false,
   "repository": "https://github.com/evilmartians/lefthook",
diff --git a/packaging/npm/lefthook/package.json b/packaging/npm/lefthook/package.json
index 2f7c4187..104159ca 100644
--- a/packaging/npm/lefthook/package.json
+++ b/packaging/npm/lefthook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lefthook",
-  "version": "1.6.16",
+  "version": "1.6.17",
   "description": "Simple git hooks manager",
   "main": "index.js",
   "repository": "https://github.com/evilmartians/lefthook",
@@ -20,14 +20,14 @@
   },
   "homepage": "https://github.com/evilmartians/lefthook#readme",
   "optionalDependencies": {
-    "lefthook-darwin-arm64": "1.6.16",
-    "lefthook-darwin-x64": "1.6.16",
-    "lefthook-linux-arm64": "1.6.16",
-    "lefthook-linux-x64": "1.6.16",
-    "lefthook-freebsd-arm64": "1.6.16",
-    "lefthook-freebsd-x64": "1.6.16",
-    "lefthook-windows-arm64": "1.6.16",
-    "lefthook-windows-x64": "1.6.16"
+    "lefthook-darwin-arm64": "1.6.17",
+    "lefthook-darwin-x64": "1.6.17",
+    "lefthook-linux-arm64": "1.6.17",
+    "lefthook-linux-x64": "1.6.17",
+    "lefthook-freebsd-arm64": "1.6.17",
+    "lefthook-freebsd-x64": "1.6.17",
+    "lefthook-windows-arm64": "1.6.17",
+    "lefthook-windows-x64": "1.6.17"
   },
   "scripts": {
     "postinstall": "node postinstall.js"
diff --git a/packaging/rubygems/lefthook.gemspec b/packaging/rubygems/lefthook.gemspec
index c2fc937a..1dee9884 100644
--- a/packaging/rubygems/lefthook.gemspec
+++ b/packaging/rubygems/lefthook.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lefthook"
-  spec.version       = "1.6.16"
+  spec.version       = "1.6.17"
   spec.authors       = ["A.A.Abroskin", "Evil Martians"]
   spec.email         = ["lefthook@evilmartians.com"]