diff --git a/dev/build.sh b/dev/build.sh
index 7b9d5cb..3b3f827 100755
--- a/dev/build.sh
+++ b/dev/build.sh
@@ -6,6 +6,11 @@ set -e
 echo "The Things Network RPi + IC880A Gateway Builder/Installer"
 echo ""
 
+# Make sure that we're able to do apt-get's quickly at runtime
+# to install necessary tools.  Tough to pay the price here,
+# but it's still better here than at device startup.
+apt-get update
+
 # Build in a temp folder that we'll completely  purge after build,
 # and install into the linux folder where apps reside.
 
diff --git a/run.sh b/run.sh
index f76c8f0..a573c62 100755
--- a/run.sh
+++ b/run.sh
@@ -149,7 +149,7 @@ echo -e "{\n\
 # Set gateway_ID in local_conf.json to the gateway's MAC address
 
 echo "******************"
-apt-get update && apt-get install iproute
+apt-get install iproute
 ./set-gateway-id.sh start ./local_conf.json
 echo "******************"
 echo ""