diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 92db6ef5d..4b8b86ebd 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://neovim.org/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-_COMMIT=7fd771619f2a2e2fe6007aaa6aa9a02cbdd205bd
-TERMUX_PKG_VERSION=0.1.6.201608292035
+_COMMIT=68bcb32ec43e2fab30dc05439fc77cf28793922c
+TERMUX_PKG_VERSION=0.1.6.201609241352
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
@@ -39,6 +39,7 @@ termux_step_configure () {
 		-DCMAKE_SYSTEM_NAME=Android \
 		-DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG \
 		-DENABLE_JEMALLOC=OFF \
+		-DGPERF_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/gperf \
 		-DLUA_PRG=$TERMUX_PKG_HOSTBUILD_DIR/deps/usr/bin/luajit \
 		$TERMUX_PKG_SRCDIR
 }
diff --git a/packages/neovim/runtime-autoload-man.vim.patch b/packages/neovim/runtime-autoload-man.vim.patch
new file mode 100644
index 000000000..597a27761
--- /dev/null
+++ b/packages/neovim/runtime-autoload-man.vim.patch
@@ -0,0 +1,30 @@
+diff -u -r ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim ./runtime/autoload/man.vim
+--- ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim	2016-09-22 08:11:13.000000000 -0400
++++ ./runtime/autoload/man.vim	2016-09-24 14:41:35.806285095 -0400
+@@ -79,7 +79,7 @@
+   " http://comments.gmane.org/gmane.editors.vim.devel/29085
+   " Respect $MANWIDTH, or default to window width.
+   let cmd  = 'env MANPAGER=cat'.(empty($MANWIDTH) ? ' MANWIDTH='.winwidth(0) : '')
+-  let cmd .= ' '.s:man_cmd.' '.shellescape(a:path)
++  let cmd .= ' '.s:man_cmd.' -l '.shellescape(a:path).'| uniq'
+   silent put =system(cmd)
+   " remove all the backspaced text
+   execute 'silent keeppatterns keepjumps %substitute,.\b,,e'.(&gdefault?'':'g')
+@@ -112,7 +112,7 @@
+ 
+ function! s:get_path(sect, name) abort
+   if empty(a:sect)
+-    let path = system(s:man_cmd.' '.s:man_find_arg.' '.shellescape(a:name))
++    let path = system(s:man_cmd.' '.s:man_find_arg.' '.shellescape(a:name).'| head -n 1')
+     if path !~# '^\/'
+       throw 'no manual entry for '.a:name
+     endif
+@@ -123,7 +123,7 @@
+   "   - sections starting with '-'
+   "   - 3pcap section (found on macOS)
+   "   - commas between sections (for section priority)
+-  return system(s:man_cmd.' '.s:man_find_arg.' -s '.shellescape(a:sect).' '.shellescape(a:name))
++  return system(s:man_cmd.' '.s:man_find_arg.' -s '.shellescape(a:sect).' '.shellescape(a:name).'| head -n 1')
+ endfunction
+ 
+ function! s:verify_exists(sect, name) abort