v0.6.1
diff --git a/CHANGELOG b/CHANGELOG
index 8978413..b9f2331 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.6.1
+=====
+- trailing-whitespace-hook: restore original file on catastrophic failure
+- trailing-whitespace-hook: support crlf
+- check-yaml: Use safe_load
+- check-json: allow custom key sort
+- check-json: display filename for non-utf8 files
+- New hook: forbid-new-submodules
+
0.6.0
=====
- Merge conflict detection no longer crashes on binary files
diff --git a/setup.py b/setup.py
index 774bc2e..fb6abad 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
name='pre_commit_hooks',
description='Some out-of-the-box hooks for pre-commit.',
url='https://github.com/pre-commit/pre-commit-hooks',
- version='0.6.0',
+ version='0.6.1',
author='Anthony Sottile',
author_email='asottile@umich.edu',