diff --git a/scripts/ubuntu-setup.sh b/scripts/ubuntu-setup.sh
index e700320cb..10bea9fdf 100755
--- a/scripts/ubuntu-setup.sh
+++ b/scripts/ubuntu-setup.sh
@@ -8,14 +8,16 @@ PACKAGES="$PACKAGES cmake"
 PACKAGES="$PACKAGES curl"			# Used for fetching sources
 PACKAGES="$PACKAGES flex"
 PACKAGES="$PACKAGES gettext"			# Provides 'msgfmt' which the apt build uses
+PACKAGES="$PACKAGES git"			# Used by the neovim build
 PACKAGES="$PACKAGES help2man"
 PACKAGES="$PACKAGES libc6-dev-i386"		# Needed by luajit host part of the build for <sys/cdefs.h>
 PACKAGES="$PACKAGES libcurl4-openssl-dev"	# XXX: Needed by apt build
 PACKAGES="$PACKAGES libgdk-pixbuf2.0-dev"	# Provides 'gkd-pixbuf-query-loaders' which the librsvg build uses
 PACKAGES="$PACKAGES libglib2.0-dev"		# Provides 'glib-genmarshal' which the glib build uses
 PACKAGES="$PACKAGES libncurses5-dev"
-PACKAGES="$PACKAGES libtool"
+PACKAGES="$PACKAGES libtool-bin"
 PACKAGES="$PACKAGES lzip"
+PACKAGES="$PACKAGES luarocks"			# Used by the neovim build.
 PACKAGES="$PACKAGES subversion"			# Used by the netpbm build.
 PACKAGES="$PACKAGES tar"
 PACKAGES="$PACKAGES unzip"
@@ -28,5 +30,10 @@ PACKAGES="$PACKAGES xmlto"
 PACKAGES="$PACKAGES xutils-dev"			# Provides u'makedepend' which the openssl build uses
 sudo apt-get install -y $PACKAGES
 
+# Needed by neovim build:
+luarocks install lpeg
+luarocks install mpack
+luarocks install luabitop
+
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R $USER /data