diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..ddc408d9
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,22 @@
+Changelog for fishnet
+=====================
+
+v1.17.0
+-------
+
+* Option to join only if a backlog is building up. Added `--user-backlog`
+  and `--system-backlog` to configure threshold for oldest item in queue.
+  Run `python -m fishnet configure` to rerun the setup dialog.
+* Slow clients no longer work on young user requested analysis jobs. The
+  threshold is continuously adjusted based on performance on other jobs.
+
+v1.16.1
+-------
+
+* Fix false positive slowness warning.
+
+v1.16.0
+-------
+
+* Removed `--threads-per-process`.
+* Warning if client is unsustainably slow.
diff --git a/MANIFEST.in b/MANIFEST.in
index 926cc7b1..27c85ab6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include README.rst
 include LICENSE.txt
+include CHANGELOG.md
diff --git a/fishnet.py b/fishnet.py
index 9684c64f..ab49ba9b 100755
--- a/fishnet.py
+++ b/fishnet.py
@@ -95,7 +95,7 @@
     DEAD_ENGINE_ERRORS = (EOFError, IOError)
 
 
-__version__ = "1.16.1"
+__version__ = "1.17.0"  # remember to update changelog
 
 __author__ = "Niklas Fiekas"
 __email__ = "niklas.fiekas@backscattering.de"