diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a8ea8b..2280955 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.15.1
+------
+- Fixed panic when the pattern occurs after 2^15-th column
+- Fixed rendering delay when displaying extremely long lines
+
 0.15.0
 ------
 - Improved fuzzy search algorithm
diff --git a/install b/install
index 4d9e44a..579fcd3 100755
--- a/install
+++ b/install
@@ -2,8 +2,8 @@
 
 set -u
 
-[[ "$@" =~ --pre ]] && version=0.15.0 pre=1 ||
-                       version=0.15.0 pre=0
+[[ "$@" =~ --pre ]] && version=0.15.1 pre=1 ||
+                       version=0.15.1 pre=0
 
 auto_completion=
 key_bindings=
diff --git a/man/man1/fzf-tmux.1 b/man/man1/fzf-tmux.1
index 92d25e9..a6d674b 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 "Sep 2016" "fzf 0.15.0" "fzf-tmux - open fzf in tmux split pane"
+.TH fzf-tmux 1 "Sep 2016" "fzf 0.15.1" "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 13feb37..f8e8239 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 "Sep 2016" "fzf 0.15.0" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Sep 2016" "fzf 0.15.1" "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 acb3b4c..ca8b475 100644
--- a/src/constants.go
+++ b/src/constants.go
@@ -8,7 +8,7 @@ import (
 
 const (
 	// Current version
-	version = "0.15.0"
+	version = "0.15.1"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond