diff --git a/README.md b/README.md
index 8f8ec3c..53bca81 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ the likes.
 Requirements
 ------------
 
-fzf requires Ruby (>= 1.8.5).
+fzf requires Ruby (>= 1.8.5). 'curses' gem is required for [Ruby 2.1 or
+above](https://bugs.ruby-lang.org/issues/8584).
 
 Installation
 ------------
diff --git a/fzf.gemspec b/fzf.gemspec
index 46bd80a..cc682e5 100644
--- a/fzf.gemspec
+++ b/fzf.gemspec
@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.6.0'
+  spec.version       = '0.6.1'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}
@@ -12,4 +12,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = '.'
   spec.files         = %w[fzf.gemspec]
   spec.executables   = 'fzf'
+
+  spec.add_runtime_dependency 'curses', '~> 1.0.0'
 end
diff --git a/install b/install
index 5ef7962..7a98cb3 100755
--- a/install
+++ b/install
@@ -15,11 +15,18 @@ echo "OK"
 # Curses-support
 echo -n "Checking Curses support ... "
 /usr/bin/env ruby -e "begin; require 'curses'; rescue Exception; exit 1; end"
-if [ $? -ne 0 ]; then
-  echo "Your ruby does not support 'curses'"
-  exit 1
+if [ $? -eq 0 ]; then
+  echo "OK"
+else
+  echo "Not found"
+  echo "Installing 'curses' gem ... "
+  /usr/bin/env gem install curses
+  if [ $? -ne 0 ]; then
+    echo "Failed to install 'curses' gem."
+    echo "Try installing it as root: sudo gem install curses"
+    exit 1
+  fi
 fi
-echo "OK"
 
 # Ruby version
 echo -n "Checking Ruby version ... "
@@ -154,7 +161,7 @@ for shell in bash zsh; do
 done
 
 cat << EOF
-Finished. Reload your .bashrc or .zshrc to take effect.
+Finished. Reload your .bashrc or .zshrc.
    source ~/.bashrc  # bash"
    source ~/.zshrc   # zsh"