diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c16772..76b37c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,24 @@
 CHANGELOG
 =========
 
+0.17.2
+------
+- `$LINES` and `$COLUMNS` are exported to preview command so that the command
+  knows the exact size of the preview window.
+- Better error messages when the default command or `$FZF_DEFAULT_COMMAND`
+  fails.
+- Reverted #1061 to avoid having duplicate entries in the list when find
+  command detected a file system loop (#1120). The default command now
+  requires that find supports `-fstype` option.
+- fzf now distinguishes mouse left click and right click (#1130)
+    - Right click is now bound to `toggle` action by default
+    - `--bind` understands `left-click` and `right-click`
+- Added `replace-query` action (#1137)
+    - Replaces query string with the current selection
+- Added `accept-non-empty` action (#1162)
+    - Same as accept, except that it prevents fzf from exiting without any
+      selection
+
 0.17.1
 ------
 
diff --git a/install b/install
index d3e21e1..22a8c77 100755
--- a/install
+++ b/install
@@ -2,7 +2,7 @@
 
 set -u
 
-version=0.17.1
+version=0.17.2
 auto_completion=
 key_bindings=
 update_config=2
diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1
index 8de9f69..573f251 100644
--- a/man/man1/fzf-tmux.1
+++ b/man/man1/fzf-tmux.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf-tmux 1 "Oct 2017" "fzf 0.17.1" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Dec 2017" "fzf 0.17.2" "fzf-tmux - open fzf in tmux split pane"
 
 .SH NAME
 fzf-tmux - open fzf in tmux split pane
diff --git a/man/man1/fzf.1 b/man/man1/fzf.1
index 6001250..7a03ce0 100644
--- a/man/man1/fzf.1
+++ b/man/man1/fzf.1
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Oct 2017" "fzf 0.17.1" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Dec 2017" "fzf 0.17.2" "fzf - a command-line fuzzy finder"
 
 .SH NAME
 fzf - a command-line fuzzy finder
diff --git a/src/constants.go b/src/constants.go
index 8eddce9..eebb192 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -9,7 +9,7 @@ import (
 
 const (
 	// Current version
-	version = "0.17.1"
+	version = "0.17.2"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond