diff --git a/debian/changelog b/debian/changelog
index c48b48c..6f0e9bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ mold (1.4.0+dfsg-1) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
   * New upstream release
+  * Add gdb as a build dep for tests
+  * For now, use TBB from the tree
+    See https://github.com/rui314/mold/issues/600
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 05 Aug 2022 09:43:13 +0200
 
diff --git a/debian/control b/debian/control
index a17a040..f778ad1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends:
  libxxhash-dev,
  pkg-config,
  zlib1g-dev,
+ gdb
 Standards-Version: 4.6.0
 Homepage: https://github.com/rui314/mold
 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/mold
diff --git a/debian/patches/series b/debian/patches/series
index ec03c2d..6133cfc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 pie.diff
 fix-prefix.diff
 avoid-overwriting-CFLAGS.diff
+
diff --git a/debian/rules b/debian/rules
index 2d9fd94..1bf761c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 export SYSTEM_MIMALLOC = 1
-export SYSTEM_TBB = 1
+#export SYSTEM_TBB = 1
 
 %:
 	dh $@