diff --git a/debian/changelog b/debian/changelog
index a673098727..0eab489b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rustc (1.34.2+dfsg1-1) UNRELEASED; urgency=medium
 
   * Don't use system compiler-rt, there are issues with that for now.
+  * Downgrade back to LLVM 7, easier for the buster release.
 
  -- Ximin Luo <infinity0@debian.org>  Wed, 29 May 2019 21:50:40 -0700
 
diff --git a/debian/control b/debian/control
index 6d8338e786..601ae7e3fc 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 9),
                cargo:native (>= 0.31.0)      <!pkg.rustc.dlstage0>,
                rustc:native (>= 1.33.0+dfsg) <!pkg.rustc.dlstage0>,
                rustc:native (<= 1.34.2++)    <!pkg.rustc.dlstage0>,
-               llvm-8-dev:native,
-               llvm-8-tools:native,
-               libllvm8,
+               llvm-7-dev:native,
+               llvm-7-tools:native,
+               libllvm7 (>= 1:7.0.1-3),
                autotools-dev,
                cmake (>= 3.0) | cmake3,
 # needed by some vendor crates
@@ -132,7 +132,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-8, ${misc:Depends}, python-lldb-8
+Depends: lldb-7, ${misc:Depends}, python-lldb-7
 Replaces: rustc (<< 1.1.0+dfsg1-1)
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It
diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
index 3ba4e1bdd3..ce374a1210 100644
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -31,7 +31,7 @@ Forwarded: not-needed
 -        echo "***"
 -    fi
 -fi
-+lldb=lldb-8
++lldb=lldb-7
  
  # Prepare commands that will be loaded before any file on the command line has been loaded
 -script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_rust_formatters.py\""
diff --git a/debian/rules b/debian/rules
index 39695299c6..5aedec810b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,8 @@ export DEB_HOST_RUST_TYPE
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
 # Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 8
-OLD_LLVM_VERSION = 7
+LLVM_VERSION = 7
+OLD_LLVM_VERSION = 6.0
 # Make it easier to test against a custom LLVM
 ifneq (,$(LLVM_DESTDIR))
 LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib
diff --git a/debian/rust-lldb.links b/debian/rust-lldb.links
index beae1fbd73..e078115708 100644
--- a/debian/rust-lldb.links
+++ b/debian/rust-lldb.links
@@ -1 +1 @@
-usr/share/man/man1/lldb-8.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-7.1.gz usr/share/man/man1/rust-lldb.1.gz