diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index bee0e4866..9755041b5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,20 +1,24 @@
-  1124	Aldo Cortesi
-   810	Maximilian Hils
-    80	Marcelo Glezer
-    48	Thomas Kriechbaumer
+  1126	Aldo Cortesi
+   881	Maximilian Hils
+   109	Thomas Kriechbaumer
+    83	Marcelo Glezer
     28	Jim Shaver
     18	Henrik Nordstrom
+    17	Shadab Zafar
+    14	David Weinstein
     13	Thomas Roth
     12	Pedro Worcel
     11	Jake Drahos
     11	Justus Wingert
     11	Stephen Altamirano
     10	András Veres-Szentkirályi
-     9	Chris Czub
+    10	Chris Czub
      9	Legend Tang
+     9	Matthew Shao
      8	Jason A. Novak
      8	Rouli
      7	Alexis Hildebrandt
+     7	Sandor Nemes
      5	Brad Peabody
      5	Choongwoo Han
      5	Matthias Urlichs
@@ -23,16 +27,19 @@
      5	iroiro123
      4	Bryan Bishop
      4	Marc Liyanage
-     4	Matthew Shao
+     4	Michael J. Bazzinotti
      4	Valtteri Virtanen
      4	Wade 524
      4	Youhei Sakurai
      4	root
      3	Chris Neasbitt
-     3	David Weinstein
      3	Eli Shvartsman
+     3	Guillem Anguera
      3	Kyle Manna
+     3	MatthewShao
+     3	Ryan Welton
      3	Zack B
+     2	Anant
      2	Bennett Blodinger
      2	Colin Bendell
      2	Heikki Hannikainen
@@ -42,6 +49,7 @@
      2	Mark E. Haase
      2	Michael Frister
      2	Nick Badger
+     2	Niko Kommenda
      2	Rob Wills
      2	Terry Long
      2	Wade Catron
@@ -50,20 +58,24 @@
      2	israel
      1	Andy Smith
      1	Ben Lerner
+     1	Chris Hamant
      1	Dan Wilbraham
      1	David Dworken
      1	David Shaw
      1	Doug Lethin
      1	Eric Entzel
      1	Felix Wolfsteller
+     1	Felix Yan
      1	FreeArtMan
      1	Gabriel Kirkpatrick
      1	Henrik Nordström
      1	Ivaylo Popov
      1	JC
      1	Jakub Nawalaniec
+     1	Jakub Wilk
      1	James Billingham
      1	Jean Regisser
+     1	Jorge Villacorta
      1	Kit Randel
      1	Kyle Morton
      1	Lucas Cimon
@@ -71,6 +83,7 @@
      1	Michael Bisbjerg
      1	Mike C
      1	Mikhail Korobov
+     1	Morton Fox
      1	Nick HS
      1	Nick Raptis
      1	Nicolas Esteves
@@ -83,6 +96,7 @@
      1	Sahn Lam
      1	Seppo Yli-Olli
      1	Sergey Chipiga
+     1	Stefan Wärting
      1	Steve Phillips
      1	Steven Van Acker
      1	Suyash
@@ -91,6 +105,7 @@
      1	Timothy Elliott
      1	Ulrich Petri
      1	Vyacheslav Bakhmutov
+     1	Will Coster
      1	Yuangxuan Wang
      1	capt8bit
      1	davidpshaw
@@ -105,3 +120,4 @@
      1	sentient07
      1	sethp-jive
      1	vzvu3k6k
+     1	依云
diff --git a/libmproxy/version.py b/libmproxy/version.py
index 25c567069..664c2b280 100644
--- a/libmproxy/version.py
+++ b/libmproxy/version.py
@@ -1,6 +1,6 @@
 from __future__ import (absolute_import, print_function, division)
 
-IVERSION = (0, 16)
+IVERSION = (0, 17)
 VERSION = ".".join(str(i) for i in IVERSION)
 MINORVERSION = ".".join(str(i) for i in IVERSION[:2])
 NAME = "mitmproxy"