diff --git a/gnome-software-3.36.0.tar.xz b/gnome-software-3.36.0.tar.xz
deleted file mode 100644
index 5a5a564..0000000
--- a/gnome-software-3.36.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daa9b5979db69d429bfb150db57247ead1450f6fa93ce2bc142c8ca2c00cab2c
-size 8276712
diff --git a/gnome-software-3.36.1.tar.xz b/gnome-software-3.36.1.tar.xz
new file mode 100644
index 0000000..9fa48a7
--- /dev/null
+++ b/gnome-software-3.36.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d4d66c70780539f204f96088da4fcb02371b0a8147f9266ce632ca784bf6f6e
+size 8277796
diff --git a/gnome-software.changes b/gnome-software.changes
index 0dfe16e..ab3ee14 100644
--- a/gnome-software.changes
+++ b/gnome-software.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri May 22 18:13:46 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.36.1:
+  + Add distro upgrade css for the HC theme.
+  + Check if a stock icon actually exists in the theme.
+  + Correctly mark layered local packages as removable.
+  + Fine-tune F32 upgrade banner position and font.
+  + Fix loading if applications directory does not exist.
+  + Fix the progress info required for the loading page.
+  + Handle invalid snap auth data.
+  + Improve performance when showing lots of applications.
+  + Only delete the installed firmware archive if we downloaded it.
+  + Properly check if an flatpak application is a runtime.
+  + Show the correct state for local packages without AppData.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu May 21 01:59:11 UTC 2020 - Jonathan Kang <songchuan.kang@suse.com>
+
+- Re-autostart GNOME Software and re-enable its search extension
+  (bsc#1168861, bsc#1157928).
+
 -------------------------------------------------------------------
 Wed Mar 11 13:57:51 UTC 2020 - bjorn.lie@gmail.com
 
diff --git a/gnome-software.spec b/gnome-software.spec
index 28b61bc..66c1b6c 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -18,7 +18,7 @@
 
 %define gs_plugin_api 13
 Name:           gnome-software
-Version:        3.36.0
+Version:        3.36.1
 Release:        0
 Summary:        GNOME Software Store
 License:        GPL-2.0-or-later
@@ -92,21 +92,6 @@ GNOME software store plugins.
 # Remove any piece of doc that ends up in non-standard locations and use the doc macro instead
 rm %{buildroot}%{_datadir}/doc/%{name}/README.md
 
-%if 0%{?sle_version} == 150200
-#needed for both Leap and SLE
-#workaround until bsc#1157928 is resolved, otherwise SLES users get authentication popup all the time
-cat << EOF >> %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop
-Hidden=true
-EOF
-
-cat << EOF > %{buildroot}%{_datadir}/glib-2.0/schemas/00_org.gnome.software.gschema.override
-#workaround until bsc#1157928 is resolved, otherwise SLES users get authentication popup all the time
-[org.gnome.desktop.search-providers]
-disabled=["org.gnome.Software.desktop"]
-EOF
-
-%endif
-
 %files
 %license COPYING
 %doc NEWS README.md
@@ -125,9 +110,6 @@ EOF
 %{_datadir}/dbus-1/services/org.gnome.Software.service
 %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
 %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
-%if 0%{?sle_version} == 150200
-%{_datadir}/glib-2.0/schemas/00_org.gnome.software.gschema.override
-%endif
 %dir %{_datadir}/gnome-shell
 %dir %{_datadir}/gnome-shell/search-providers
 %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini