diff --git a/.gitignore b/.gitignore
index de00a10..c4eec28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
 /initial-setup-0.3.33.tar.gz
 /initial-setup-0.3.34.tar.gz
 /initial-setup-0.3.35.tar.gz
+/initial-setup-0.3.36.tar.gz
diff --git a/initial-setup.spec b/initial-setup.spec
index f3c30f3..f96e17d 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -1,8 +1,8 @@
 Summary: Initial system configuration utility
 Name: initial-setup
 URL: https://fedoraproject.org/wiki/InitialSetup
-Version: 0.3.35
-Release: 2%{?dist}
+Version: 0.3.36
+Release: 1%{?dist}
 
 # This is a Red Hat maintained package which is specific to
 # our distribution.
@@ -13,7 +13,7 @@ Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 
 %define debug_package %{nil}
-%define anacondaver 21.46
+%define anacondaver 24.0
 
 License: GPLv2+
 Group: System Environment/Base
@@ -74,14 +74,7 @@ make DESTDIR=%{buildroot} install
 rm -rf %{buildroot}
 
 %post
-if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
-  platform="$(arch)"
-  if [ "$platform" = "s390" -o "$platform" = "s390x" ]; then
-    echo "RUN_INITIAL_SETUP=YES" > /etc/sysconfig/initial-setup
-  else
-    %systemd_post initial-setup-text.service
-  fi
-fi
+%systemd_post initial-setup-text.service
 
 %preun
 %systemd_preun initial-setup-text.service
@@ -116,6 +109,15 @@ fi
 %{_unitdir}/initial-setup-graphical.service
 
 %changelog
+* 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)
+- Don't create /etc/sysconfig/initial-setup on s390 (#1181209) (mkolman)
+- Use systemd service status for run detection on S390 console (#1181209) (mkolman)
+- Read the kickstart from previous IS run, if available (#1110439) (mkolman)
+- 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.
 
diff --git a/sources b/sources
index b0d3f54..40e8de8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6818145043b67e30f973e0327d73de9c  initial-setup-0.3.35.tar.gz
+f3e137d16d5a14b77e6a003041f20045  initial-setup-0.3.36.tar.gz