diff --git a/main.sh b/main.sh
index 3e415aad1..bce206df1 100755
--- a/main.sh
+++ b/main.sh
@@ -23,12 +23,11 @@ fi
 # Get build deps
 apt-get build-dep "$PIKA_PACKAGE_NAME=$VERSION" -y
 
-# Build package
-for i in ./*.dsc
-do
-    cd $(dpkg-source -x $i | grep "dpkg-source: info: extracting $1 in" | cut -d":" -f3 | sed -s "s/extracting $1 in/ /g")
-    dpkg-buildpackage --no-sign
-done
+find ./ -maxdepth 1 -name "$PIKA_PACKAGE_NAME*" -type d | head -1
+
+cd $(find ./ -maxdepth 1 -name "$PIKA_PACKAGE_NAME*" -type d | head -1)
+dpkg-buildpackage --no-sign
+
 
 # Move the debs to output
 cd ../
diff --git a/pika-build-config/lto.sh b/pika-build-config/lto.sh
index b13e08d75..9eadfb7b0 100644
--- a/pika-build-config/lto.sh
+++ b/pika-build-config/lto.sh
@@ -2,4 +2,4 @@ export PIKA_PACKAGE_VERSION="1:3.5.1-12"
 export PIKA_PACKAGE_NAME="amanda"
 export PIKA_PACKAGE_PATCH=false
 export PIKA_REBUILD=false
-export PIKA_REBUILD_VERSION="b3"
+export PIKA_REBUILD_VERSION="b2"