diff --git a/0001-data-Disable-g-i-s-service-in-GDM.patch b/0001-data-Disable-g-i-s-service-in-GDM.patch
new file mode 100644
index 0000000..e08f6a4
--- /dev/null
+++ b/0001-data-Disable-g-i-s-service-in-GDM.patch
@@ -0,0 +1,43 @@
+From b67b5cc48c418415eb3233f78ab089bc447b1952 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 9 Sep 2019 22:38:44 +0100
+Subject: [PATCH] data: Disable g-i-s service in GDM
+
+gnome-initial-setup should never run in GDM, add a conflict to prevent
+this from happening.
+---
+ data/gnome-initial-setup-copy-worker.service.in | 3 +++
+ data/gnome-initial-setup-first-login.service.in | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/data/gnome-initial-setup-copy-worker.service.in b/data/gnome-initial-setup-copy-worker.service.in
+index 9b411d0..b7627d0 100644
+--- a/data/gnome-initial-setup-copy-worker.service.in
++++ b/data/gnome-initial-setup-copy-worker.service.in
+@@ -4,6 +4,9 @@ Description=GNOME Initial Setup Copy Worker
+ # Make sure we run really early
+ Before=gnome-session-pre.target graphical-session-pre.target
+ 
++# Never run in GDM
++Conflicts=gnome-session@gnome-login.target
++
+ ConditionPathExists=!%E/gnome-initial-setup-done
+ 
+ [Service]
+diff --git a/data/gnome-initial-setup-first-login.service.in b/data/gnome-initial-setup-first-login.service.in
+index 302753b..940395a 100644
+--- a/data/gnome-initial-setup-first-login.service.in
++++ b/data/gnome-initial-setup-first-login.service.in
+@@ -7,6 +7,9 @@ After=gnome-session.target
+ # Together with Type=oneshot, make sure the welcome tour starts after setup
+ Before=gnome-welcome-tour.service
+ 
++# Never run in GDM
++Conflicts=gnome-session@gnome-login.target
++
+ Conflicts=gnome-session@gnome-initial-setup.target
+ ConditionPathExists=!%E/gnome-initial-setup-done
+ 
+-- 
+2.21.0
+
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 8f2a7f8..d58483f 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -6,7 +6,7 @@
 
 Name:           gnome-initial-setup
 Version:        3.34.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
@@ -15,6 +15,8 @@ Source0:        https://download.gnome.org/sources/%{name}/3.30/%{name}-%{versio
 Source1:        vendor.conf
 Patch0:         honor-firstboot-disabled.patch
 
+Patch100:       0001-data-Disable-g-i-s-service-in-GDM.patch
+
 BuildRequires:  meson
 BuildRequires:  gcc
 BuildRequires:  krb5-devel
@@ -108,6 +110,11 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Mon Sep 09 2019 Benjamin Berg <bberg@redhat.com> - 3.34.0-2
+- Fix g-i-s starting in GDM
+  Upstream MR https://gitlab.gnome.org/GNOME/gnome-initial-setup/merge_requests/59
+- Resolves: 1750237
+
 * Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
 - Update to 3.34.0