diff --git a/build-package.sh b/build-package.sh
index 474c0710a..ed6266d34 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -448,13 +448,22 @@ termux_step_massage () {
 
 	# Remove lib/charset.alias which is installed by gettext-using packages:
 	rm -f lib/charset.alias
+
 	# Remove non-english man pages:
 	test -d share/man && (cd share/man; for f in `ls | grep -v man`; do rm -Rf $f; done )
-	# Remove info pages and other docs:
-	rm -Rf share/info share/doc share/locale
+
+	if [ -z ${TERMUX_PKG_KEEP_INFOPAGES+x} ]; then
+		# Remove info pages:
+		rm -Rf share/info
+	fi
+
+	# Remove other docs:
+	rm -Rf share/doc share/locale
+
 	# Remove old kept libraries (readline):
 	find . -name '*.old' -delete
-	# .. remove static libraries:
+
+	# Remove static libraries:
 	if [ $TERMUX_PKG_KEEP_STATIC_LIBRARIES = "false" ]; then
 		find . -name '*.a' -delete
 		find . -name '*.la' -delete
diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 3ee4bbd6e..e5f9075fe 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
 TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
 TERMUX_PKG_VERSION=25.0.92
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6
 TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --with-gnutls --with-xml2"
@@ -9,7 +9,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_sanitize_address=yes"
 # Prevent configure from adding -nopie:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" emacs_cv_prog_cc_nopie=no"
-TERMUX_PKG_HOSTBUILD="yes"
+TERMUX_PKG_HOSTBUILD=yes
+TERMUX_PKG_KEEP_INFOPAGES=yes
 
 # Remove some irrelevant files:
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/emacs/${TERMUX_PKG_VERSION}/etc/images share/applications/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.desktop share/emacs/${TERMUX_PKG_VERSION}/etc/emacs.icon bin/grep-changelog share/man/man1/grep-changelog.1.gz share/emacs/${TERMUX_PKG_VERSION}/etc/refcards share/emacs/${TERMUX_PKG_VERSION}/etc/tutorials/TUTORIAL.*"