diff --git a/debian/changelog b/debian/changelog
index 9fb2730d53..a327133c1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rustc (1.30.0+dfsg1-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable debuginfo-gdb tests relating to enums. These will be fixed in an
+    upcoming version, see upstream #54614 for details.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 30 Oct 2018 23:46:28 -0700
+
 rustc (1.30.0+dfsg1-1~exp1) experimental; urgency=medium
 
   * Actually don't build docs in an arch-only build.
diff --git a/debian/patches/d-temp-ignore-debuginfo-gdb-enum.patch b/debian/patches/d-temp-ignore-debuginfo-gdb-enum.patch
new file mode 100644
index 0000000000..62c543038a
--- /dev/null
+++ b/debian/patches/d-temp-ignore-debuginfo-gdb-enum.patch
@@ -0,0 +1,108 @@
+Description: should be fixed in rustc 1.31 or 1.32, but that requires gdb 8.2
+Bug: https://github.com/rust-lang/rust/issues/54614
+--- a/src/test/debuginfo/borrowed-c-style-enum.rs
++++ b/src/test/debuginfo/borrowed-c-style-enum.rs
+@@ -11,6 +11,7 @@
+ 
+ // compile-flags:-g
+ // min-lldb-version: 310
++// ignore-gdb
+ 
+ // === GDB TESTS ===================================================================================
+ 
+--- a/src/test/debuginfo/borrowed-enum.rs
++++ b/src/test/debuginfo/borrowed-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/c-style-enum-in-composite.rs
++++ b/src/test/debuginfo/c-style-enum-in-composite.rs
+@@ -10,6 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs
++++ b/src/test/debuginfo/gdb-pretty-struct-and-enums-pre-gdb-7-7.rs
+@@ -14,6 +14,7 @@
+ // ignore-freebsd: gdb package too new
+ // ignore-tidy-linelength
+ // ignore-lldb
++// ignore-gdb
+ // ignore-android: FIXME(#10381)
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
++++ b/src/test/debuginfo/generic-enum-with-different-disr-sizes.rs
+@@ -11,6 +11,7 @@
+ // ignore-tidy-linelength
+ // ignore-lldb: FIXME(#27089)
+ // min-lldb-version: 310
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/generic-struct-style-enum.rs
++++ b/src/test/debuginfo/generic-struct-style-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/generic-tuple-style-enum.rs
++++ b/src/test/debuginfo/generic-tuple-style-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/struct-style-enum.rs
++++ b/src/test/debuginfo/struct-style-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/tuple-style-enum.rs
++++ b/src/test/debuginfo/tuple-style-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
+--- a/src/test/debuginfo/unique-enum.rs
++++ b/src/test/debuginfo/unique-enum.rs
+@@ -10,7 +10,7 @@
+ 
+ // ignore-tidy-linelength
+ // min-lldb-version: 310
+-// ignore-gdb-version: 7.11.90 - 7.12.9
++// ignore-gdb
+ 
+ // compile-flags:-g
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 27c239fe65..d1ede6c44a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,6 +26,7 @@ d-sparc64-dont-pack-spans.patch
 
 # Debian-specific patches, not suitable for upstream
 d-disable-cargo-vendor.patch
+d-temp-ignore-debuginfo-gdb-enum.patch
 d-rust-gdb-paths
 d-rust-lldb-paths
 d-add-soname.patch