diff --git a/.gitignore b/.gitignore
index c4eec28..a2ea888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /initial-setup-0.3.34.tar.gz
 /initial-setup-0.3.35.tar.gz
 /initial-setup-0.3.36.tar.gz
+/initial-setup-0.3.37.tar.gz
diff --git a/initial-setup.spec b/initial-setup.spec
index f96e17d..d78b462 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -1,7 +1,7 @@
 Summary: Initial system configuration utility
 Name: initial-setup
 URL: https://fedoraproject.org/wiki/InitialSetup
-Version: 0.3.36
+Version: 0.3.37
 Release: 1%{?dist}
 
 # This is a Red Hat maintained package which is specific to
@@ -73,6 +73,33 @@ make DESTDIR=%{buildroot} install
 %clean
 rm -rf %{buildroot}
 
+%pre
+# There is a possibility that an initial setup service might be running
+# during package upgrade, which can together with an old version
+# of initial setup (<= 0.3.36) cause the rpm transaction to deadlock.
+# So turn of and disable any Initial Setup services if the %pre
+# scriptlet is running during upgrade or package removal to prevent
+# the deadlock.
+
+# upgrade or package removal only
+if [ $1 -gt 1 ] ; then
+    IS_GRAPHICAL="initial-setup-graphical.service"
+    IS_TEXT="initial-setup-text.service"
+    IS_GRAPHICAL_AVAILABLE=0
+    IS_TEXT_AVAILABLE=0
+    # check if the Initial Setup unit is enabled and the executable is available
+    systemctl is-enabled $IS_GRAPHICAL && IS_GRAPHICAL_AVAILABLE=1
+    systemctl is-enabled $IS_TEXT && IS_TEXT_AVAILABLE=1
+    if [ $IS_GRAPHICAL_AVAILABLE -eq 1 ]; then
+        systemctl stop $IS_GRAPHICAL
+        systemctl disable $IS_GRAPHICAL
+    fi
+    if [ $IS_TEXT_AVAILABLE -eq 1 ]; then
+        systemctl stop $IS_TEXT
+        systemctl disable $IS_TEXT
+    fi
+fi
+
 %post
 %systemd_post initial-setup-text.service
 
@@ -80,7 +107,34 @@ rm -rf %{buildroot}
 %systemd_preun initial-setup-text.service
 
 %postun
-%systemd_postun_with_restart initial-setup-text.service
+%systemd_postun initial-setup-text.service
+
+%pre gui
+# There is a possibility that an initial setup service might be running
+# during package upgrade, which can together with an old version
+# of initial setup (<= 0.3.36) cause the rpm transaction to deadlock.
+# So turn of and disable any Initial Setup services if the %pre
+# scriptlet is running during upgrade or package removal to prevent
+# the deadlock.
+
+# upgrade or package removal only
+if [ $1 -gt 1 ] ; then
+    IS_GRAPHICAL="initial-setup-graphical.service"
+    IS_TEXT="initial-setup-text.service"
+    IS_GRAPHICAL_AVAILABLE=0
+    IS_TEXT_AVAILABLE=0
+    # check if the Initial Setup unit is enabled and the executable is available
+    systemctl is-enabled $IS_GRAPHICAL && IS_GRAPHICAL_AVAILABLE=1
+    systemctl is-enabled $IS_TEXT && IS_TEXT_AVAILABLE=1
+    if [ $IS_GRAPHICAL_AVAILABLE -eq 1 ]; then
+        systemctl stop $IS_GRAPHICAL
+        systemctl disable $IS_GRAPHICAL
+    fi
+    if [ $IS_TEXT_AVAILABLE -eq 1 ]; then
+        systemctl stop $IS_TEXT
+        systemctl disable $IS_TEXT
+    fi
+fi
 
 %post gui
 %systemd_post initial-setup-graphical.service
@@ -89,7 +143,7 @@ rm -rf %{buildroot}
 %systemd_preun initial-setup-graphical.service
 
 %postun gui
-%systemd_postun_with_restart initial-setup-graphical.service
+%systemd_postun initial-setup-graphical.service
 
 %files -f %{name}.lang
 %doc COPYING README.rst
@@ -109,6 +163,12 @@ rm -rf %{buildroot}
 %{_unitdir}/initial-setup-graphical.service
 
 %changelog
+* Wed Sep 30 2015 Martin Kolman <mkolman@redhat.com> - 0.3.37-1
+- Stop any Initial Setup services before upgrading package (#1244394) (mkolman)
+- Replace systemd_postun_with_restart with systemd_postun (#1244394) (mkolman)
+- Fix 'bumpver' make target (vtrefny)
+- Add archive target to Makefile (vtrefny)
+
 * Mon Aug 31 2015 Martin Kolman <mkolman@redhat.com> - 0.3.36-1
 - Setup the locale before starting the UI (dshea)
 - Run the TUI service before hvc0.service (#1209731) (mkolman)
@@ -118,9 +178,6 @@ rm -rf %{buildroot}
 - Add support for externally triggered reconfig mode (#1110439) (mkolman)
 - Log the reason if GUI import fails (#1229747) (mkolman)
 
-* Thu Aug 20 2015 Jon Ciesla <limburgher@gmail.com> - 0.3.35-2
-- Rebuild for new LibRaw.
-
 * Thu Jul 30 2015 Martin Kolman <mkolman@redhat.com> - 0.3.35-1
 - Fix a typo in Makefile (#1244558) (mkolman)
 
diff --git a/sources b/sources
index 40e8de8..b6e8fb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3e137d16d5a14b77e6a003041f20045  initial-setup-0.3.36.tar.gz
+46f94c9e1a1424d62c2a7350519b7572  initial-setup-0.3.37.tar.gz