diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dbcdbb1..10e1c909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,30 @@
 
 ## Features
 
-- Adjust pager configuration to comply with `--wrap=never`, see #1255 (@gahag)
+## Bugfixes
+
+## Other
+
+## Syntaxes
+
+## New themes
+
+## `bat` as a library
+
+## Packaging
+
+
+# v0.17.0
+
+## Features
+
 - Added a new `--style` value, `rule`, which adds a simple horizontal ruled line between files, see #1276 (@tommilligan)
+- Pass `-S` ("chop long lines") to `less` if `--wrap=never` is set in `bat`, see #1255 (@gahag)
 
 ## Bugfixes
 
-- Throws an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)
+- Detect infinite loop when input and output are the same, see #1193 and #1197 (@niklasmohrin)
+- Throw an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)
 - Bash syntax highlighting not selected for `*.ebuild` and `*.eclass` files, see #1292 (@sharkdp)
 - Fix `zsh` completion when using `-p`, see #1320 (@xzfc)
 
@@ -26,9 +44,6 @@
 
 - Coldark, see #1329 (@armandphilippot)
 
-## `bat` as a library
-
-## Packaging
 
 # v0.16.0
 
diff --git a/Cargo.lock b/Cargo.lock
index 7ae9d8e0..ae5bfa67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,7 +92,7 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
 [[package]]
 name = "bat"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "ansi_colours",
  "ansi_term 0.12.1",
diff --git a/Cargo.toml b/Cargo.toml
index d78bf8d4..772e1695 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.16.0"
+version = "0.17.0"
 exclude = [
     "assets/syntaxes/*",
     "assets/themes/*",
diff --git a/README.md b/README.md
index 8a51a8e8..a05823ee 100644
--- a/README.md
+++ b/README.md
@@ -211,7 +211,7 @@ the most recent release of `bat`, download the latest `.deb` package from the
 [release page](https://github.com/sharkdp/bat/releases) and install it via:
 
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.0_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
diff --git a/doc/README-ja.md b/doc/README-ja.md
index 5491f800..17a5f69f 100644
--- a/doc/README-ja.md
+++ b/doc/README-ja.md
@@ -191,7 +191,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
 次の方法でインストールします:
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.0_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
diff --git a/doc/README-ko.md b/doc/README-ko.md
index 7e64f9f9..08fc9677 100644
--- a/doc/README-ko.md
+++ b/doc/README-ko.md
@@ -170,7 +170,7 @@ apt install bat
 만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 예전 버전을 사용하는 경우, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
 
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.0_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
diff --git a/doc/README-ru.md b/doc/README-ru.md
index dc9dfa56..4475b331 100644
--- a/doc/README-ru.md
+++ b/doc/README-ru.md
@@ -185,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 [release page](https://github.com/sharkdp/bat/releases) и установить так:
 
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # измените архитектуру и версию
+sudo dpkg -i bat_0.17.0_amd64.deb  # измените архитектуру и версию
 ```
 
 ### Alpine Linux