diff -Nru mutter-3.30.0/debian/changelog mutter-3.30.0/debian/changelog
--- mutter-3.30.0/debian/changelog	2018-09-05 03:30:26.000000000 -0700
+++ mutter-3.30.0/debian/changelog	2018-09-30 15:39:00.000000000 -0700
@@ -1,3 +1,10 @@
+mutter (3.30.0-1ubuntu1) cosmic; urgency=medium
+
+  * debian/patches/input-settings-x11-Push-error-trap.patch: Fix crash
+    when touching the screen using a Wacom pen.  (LP: #1788483)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Sun, 30 Sep 2018 15:39:00 -0700
+
 mutter (3.30.0-1) unstable; urgency=medium
 
   [ Didier Roche ]
diff -Nru mutter-3.30.0/debian/patches/input-settings-x11-Push-error-trap.patch mutter-3.30.0/debian/patches/input-settings-x11-Push-error-trap.patch
--- mutter-3.30.0/debian/patches/input-settings-x11-Push-error-trap.patch	1969-12-31 16:00:00.000000000 -0800
+++ mutter-3.30.0/debian/patches/input-settings-x11-Push-error-trap.patch	2018-09-30 15:39:00.000000000 -0700
@@ -0,0 +1,31 @@
+From: Florian Müllner <fmuellner@gnome.org>
+Subject: input-settings-x11: Push error trap
+
+Pops are lonely without push, so add one for a happy error trap.
+
+https://gitlab.gnome.org/GNOME/mutter/issues/294
+
+Origin: upstream, https://gitlab.gnome.org/GNOME/mutter/commit/a3d9f987c830
+Bug: https://gitlab.gnome.org/GNOME/mutter/issues/294
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1788483
+Last-Update: 2018-09-30
+Applied-Upstream: 3.30.1
+---
+ src/backends/x11/meta-input-settings-x11.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
+index 14a199e7e..cfcdf2ece 100644
+--- a/src/backends/x11/meta-input-settings-x11.c
++++ b/src/backends/x11/meta-input-settings-x11.c
+@@ -782,6 +782,7 @@ meta_input_settings_x11_set_stylus_button_map (MetaInputSettings          *setti
+     return;
+ 
+   /* Grab the puke bucket! */
++  meta_x11_error_trap_push (display->x11_display);
+   xdev = device_ensure_xdevice (device);
+   if (xdev)
+     {
+-- 
+2.19.0
+
diff -Nru mutter-3.30.0/debian/patches/series mutter-3.30.0/debian/patches/series
--- mutter-3.30.0/debian/patches/series	2018-09-05 03:30:26.000000000 -0700
+++ mutter-3.30.0/debian/patches/series	2018-09-30 15:38:59.000000000 -0700
@@ -5,3 +5,4 @@
 debian/synaptics-support.patch
 debian/skip-failing-tests.patch
 debian/skip-failing-tests-325.patch
+input-settings-x11-Push-error-trap.patch