diff --git a/.travis.yml b/.travis.yml
index 47ecc5c8..afdd6690 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,7 +81,8 @@ matrix:
             - g++-6
     - os: linux
       compiler: gcc-6
-      env: C=gcc-6-m64 B=sanitize
+      # FIXME: linking fails - need updated binutils?
+      env: C=gcc-6-m64 B=sanitize ALLOW_FAIL=1
       addons:
         apt:
           sources:
@@ -94,6 +95,7 @@ matrix:
       #osx_image: xcode7
     - os: osx
       compiler: clang
+      # FIXME: linking fails with "ld: internal error: atom not found"
       env: C=clang-m64 B=release ALLOW_FAIL=1
       #osx_image: xcode7
 
diff --git a/.travis_build.sh b/.travis_build.sh
index 336d498e..cce03256 100644
--- a/.travis_build.sh
+++ b/.travis_build.sh
@@ -58,7 +58,7 @@ xargs -0r perl -n -e '
        if ($ARGV =~ m,(^|/)\.gitmodules$,) { }
        elsif ($ARGV =~ m,(^|/)make(file|vars),i) { }
        elsif ($ARGV =~ m,/tmp/.*\.(disasm|dump)$,) { }
-       elsif ($ARGV =~ m,\.S$,) { }
+       elsif ($ARGV =~ m,/src/stub/src/arch/.*\.S$,) { }
        else { print "ERROR: hard TAB detected $ARGV: $_"; exit(1); }
     }
 ' || exit 1
@@ -92,12 +92,7 @@ release)
 sanitize)
     $make USE_SANITIZE=1 ;;
 scan-build)
-    if test "$CC" = "clang"; then
-        scan-build $make
-    else
-        $make USE_SANITIZE=1
-    fi
-    ;;
+    scan-build $make ;;
 *)
     echo "ERROR: invalid BUILD_METHOD '$BUILD_METHOD'"
     exit 1