diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh
index 2e4c2ae..ce00d74 100755
--- a/scripts/buildFilesystem.sh
+++ b/scripts/buildFilesystem.sh
@@ -101,7 +101,9 @@ build_install_crossystem() {
     apt install -y vboot-utils
 
     #install clang and pre-reqs
-    apt install -y clang uuid-dev meson pkg-config cmake libcmocka-dev cargo
+    # target unstable for now to work around #173, without breaking libinput-gestures
+    #TODO: when package build system is available, targeting unstable won't be necessary.
+    apt install -y -t unstable clang uuid-dev meson pkg-config cmake libcmocka-dev cargo
 
     flashmap_src=/root/flashmap
     mosys_src=/root/mosys
@@ -210,10 +212,14 @@ chroot $outmnt apt-get autoremove --purge
 chroot $outmnt apt-get clean
 
 #Download support for libinput-gestures
-chroot $outmnt apt install -y libinput-tools xdotool build-essential
 #Package is copied into /InstallResources/packages
+chroot $outmnt apt install -y libinput-tools xdotool
 
-chroot $outmnt apt-get install -y -t testing -d xsecurelock
+# target unstable for now to work around #173, without breaking libinput-gestures
+#TODO: when package build system is available, targeting unstable won't be necessary.
+chroot $outmnt apt install -y -t unstable build-essential
+
+chroot $outmnt apt-get install -y -t unstable -d xsecurelock
 
 #Download the packages to be installed by Install.sh:
 chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-cli dconf-editor plank network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome dtrx emacs accountsservice sudo pavucontrol-qt papirus-icon-theme sysfsutils bluetooth