diff --git a/.travis.yml b/.travis.yml
index a139b76b..5f0707f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,18 @@ branches:
     - hwacha
     - boom
     - /^hurricane.*$/
+    
+# These branches are the only ones that
+# will build when "build branch updates"
+# is set in settings (branches which PR against
+# them are still built). With this set, 
+# the above blacklist is not useful.
+# Adding this allows us to keep "Build Branch Updates" 
+# set to 'ON'.
+
+branches:
+  only:
+  - master
 
 jobs:
   include:
diff --git a/riscv-tools b/riscv-tools
index 75371b4e..6b608940 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit 75371b4e19435833f80767da691b718c68551f13
+Subproject commit 6b6089401e06ff74c2e0735ad52472ee0a214f3f