diff --git a/debian/changelog b/debian/changelog
index cf410a14..ea6b0b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,12 @@ llvm-toolchain-11 (1:11.0.0~+rc3-2) unstable; urgency=medium
     clang (LLVM option parsing): Unknown command line argument '-polly'.
     Try: 'clang (LLVM option parsing) --help'
     Also found in autopkgtest
+  * Bring back LLVM_POLLY_LINK_INTO_TOOLS=ON to workaround the error
+    clang (LLVM option parsing): Unknown command line argument '-polly'.
+    Try: 'clang (LLVM option parsing) --help'
+    Fix autopkgtest
+  * In the autopkgtest tests, update the opt arguments (-q removed and
+    -basicaa renamed to -basic-aa)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 26 Sep 2020 21:29:05 +0200
 
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 7b18ab58..00dfa1f6 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -1067,7 +1067,7 @@ clang-$VERSION -O3 -mllvm -polly -mllvm -polly-parallel -lgomp  foo.c
 clang-$VERSION -O3 -mllvm -polly -mllvm -polly-vectorizer=stripmine foo.c
 clang-$VERSION -S -fsave-optimization-record -emit-llvm foo.c -o matmul.s
 opt-$VERSION -S -polly-canonicalize matmul.s > matmul.preopt.ll > /dev/null
-opt-$VERSION -basicaa -polly-ast -analyze -q matmul.preopt.ll -polly-process-unprofitable > /dev/null
+opt-$VERSION -basic-aa -polly-ast -analyze matmul.preopt.ll -polly-process-unprofitable > /dev/null
 if test ! -f /usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py; then
     echo "Install llvm-$VERSION-tools"
     exit 42