diff --git a/.travis.yml b/.travis.yml
index 1fce0e4147..395c3a7399 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ matrix:
     # Similarly, we don't need to hold up people using stable while we wait
     # for the results which may fail.
     fast_finish: true
-dist: trusty
+dist: xenial
 sudo: false
 before_script:
     # If an old version of rustfmt from cargo is already installed, uninstall
diff --git a/wasmtime-wasi/sandboxed-system-primitives/src/config.h b/wasmtime-wasi/sandboxed-system-primitives/src/config.h
index 5fa4ce1dda..c44526290c 100644
--- a/wasmtime-wasi/sandboxed-system-primitives/src/config.h
+++ b/wasmtime-wasi/sandboxed-system-primitives/src/config.h
@@ -12,13 +12,20 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+#include <stdlib.h>
+
 #if defined(__FreeBSD__) || defined(__APPLE__)
 #define CONFIG_HAS_ARC4RANDOM_BUF 1
 #else
 #define CONFIG_HAS_ARC4RANDOM_BUF 0
 #endif
 
-#ifdef __linux__
+// On Linux, prefer to use getentropy, though it isn't available in
+// GLIBC before 2.25.
+#if defined(__linux__) && \
+    (!defined(__GLIBC__) || \
+     __GLIBC__ > 2 || \
+     (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25))
 #define CONFIG_HAS_GETENTROPY 1
 #else
 #define CONFIG_HAS_GETENTROPY 0