diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f1ff34e341ce337499df7820e28c629d2991d8a..6d7b8ebc1cf0a840b5e5584134fe01d926df385c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 0.6.0 - 2018-11-10
+
+- Add lightweight cleaning for jpeg
+- Add support for zip files
+- Add support for mp4 files
+- Improve metadata extraction for archives
+- Improve robustness against corrupted embedded files
+- Fix a possible security issue on some terminals (control character
+	injection via --show)
+- Various internal cleanup/improvements
+
 # 0.5.0 - 2018-10-23
 
 - Video (.avi files for now) support, via FFmpeg, optionally
diff --git a/doc/mat2.1 b/doc/mat2.1
index 2480efc7276f66965c8815e0d96e5d20a3b62377..2239766d9d5767cab150fe6e6e8941984b1bd11b 100644
--- a/doc/mat2.1
+++ b/doc/mat2.1
@@ -1,4 +1,4 @@
-.TH MAT2 "1" "October 2018" "MAT2 0.5.0" "User Commands"
+.TH MAT2 "1" "November 2018" "MAT2 0.6.0" "User Commands"
 
 .SH NAME
 mat2 \- the metadata anonymisation toolkit 2
diff --git a/mat2 b/mat2
index 351d97b4a685f05f35b101f1d5c73d805eddb727..ff8a253e6c5aacfab7528a24f86f68dea934116b 100755
--- a/mat2
+++ b/mat2
@@ -15,7 +15,7 @@ except ValueError as e:
     print(e)
     sys.exit(1)
 
-__version__ = '0.5.0'
+__version__ = '0.6.0'
 
 # Make pyflakes happy
 assert Tuple
diff --git a/setup.py b/setup.py
index 06ede62f909c2e17501e1c2710af8e58477b8778..499ac84320715137126401a0a66efeec55b6d2c2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="mat2",
-    version='0.5.0',
+    version='0.6.0',
     author="Julien (jvoisin) Voisin",
     author_email="julien.voisin+mat2@dustri.org",
     description="A handy tool to trash your metadata",