diff --git a/AUTHORS b/AUTHORS
index 529a9acc..a2baff0f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,3 +39,4 @@ Nicolas Werner
 Matt Hayden
 Simos Xenitellis
 Finnegan Stack
+Amos Bird
diff --git a/configure.ac b/configure.ac
index d6875822..5253e970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,6 +277,7 @@ AS_IF([test $? -eq 0],
 
 AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0)
 AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"")
+AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ])
 
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 01b85ea7..12af779d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -483,8 +483,10 @@ uncrusty:
 	(cd $(srcdir) && uncrustify -c ../lnav.cfg --replace $(SOURCES) \
 		$(HEADERS))
 
+if !DISABLE_DOCUMENTATION
 all-local: lnav
 	env DUMP_INTERNALS_DIR=$(srcdir)/internals ./lnav Makefile
+endif
 
 install-exec-hook:
 	bash $(srcdir)/alpha-release.sh
diff --git a/test/drive_line_buffer.cc b/test/drive_line_buffer.cc
index 3e837ecf..d365b4c7 100644
--- a/test/drive_line_buffer.cc
+++ b/test/drive_line_buffer.cc
@@ -40,6 +40,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
+#include <random>
 #include <tuple>
 #include <string>
 #include <vector>
@@ -212,7 +213,9 @@ int main(int argc, char *argv[])
 				do {
 					size_t lpc;
 
-					random_shuffle(index.begin(), index.end());
+					std::random_device rd;
+					std::mt19937 g(rd());
+					std::shuffle(index.begin(), index.end(), g);
 					for (lpc = 0; lpc < index.size(); lpc++) {
 					    const auto &index_tuple = index[lpc];