diff --git a/autoyast2-4.3.6.tar.bz2 b/autoyast2-4.3.6.tar.bz2
deleted file mode 100644
index 640e909..0000000
--- a/autoyast2-4.3.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:033d60532c62957208a2818f8323e5c5a468e67c89d86714e05e1c37f7274511
-size 705147
diff --git a/autoyast2-4.3.7.tar.bz2 b/autoyast2-4.3.7.tar.bz2
new file mode 100644
index 0000000..348e931
--- /dev/null
+++ b/autoyast2-4.3.7.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02f527a61c6b7e984fdc287190ab94ba3866b7cf7813a02728aaae715f495b18
+size 701043
diff --git a/autoyast2.changes b/autoyast2.changes
index 154f82b..9a0bba3 100644
--- a/autoyast2.changes
+++ b/autoyast2.changes
@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Wed May 27 15:03:50 UTC 2020 - schubi@suse.de
+- AutoYaST: Cleanup/improve issue handling (bsc#1171335).
+- 4.3.7
+
 -------------------------------------------------------------------
 Wed May 27 14:03:50 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 
-- When running an autoinstallation with the Online mediun, the
+- When running an autoinstallation with the Online medium, the
   network configuration based on the profile can be written before
   the registration takes place (bsc#1171922)
 - 4.3.6
diff --git a/autoyast2.spec b/autoyast2.spec
index da8656a..d559061 100644
--- a/autoyast2.spec
+++ b/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.6
+Version:        4.3.7
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only
@@ -41,8 +41,8 @@ BuildRequires:  libxml2-tools
 # xsltproc for AutoinstClass
 BuildRequires:  libxslt
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
-# Yast::Popup.ErrorAnyQuestion fixed
-BuildRequires:  yast2 >= 4.0.60
+# AutoYaST issue handling
+BuildRequires:  yast2 >= 4.3.2
 # FileSystems.read_default_subvol_from_target
 BuildRequires:  yast2-country
 BuildRequires:  yast2-network >= 3.1.145
@@ -66,8 +66,8 @@ BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
 
 Requires:       autoyast2-installation = %{version}
 Requires:       libxslt
-# Y2Packager::ProductUpgrade.remove_obsolete_upgrades
-Requires:       yast2 >= 4.2.1
+# AutoYaST issue handling
+Requires:       yast2 >= 4.3.2
 Requires:       yast2-core
 Requires:       yast2-country >= 3.1.13
 # Moving security module to first installation stage
@@ -282,9 +282,6 @@ done
 %dir %{yast_libdir}/autoinstall/clients
 %{yast_libdir}/autoinstall/clients/*.rb
 
-%dir %{yast_libdir}/autoinstall/autoinst_issues
-%{yast_libdir}/autoinstall/autoinst_issues/*.rb
-
 # scripts
 %{yast_ybindir}/fetch_image.sh
 %{yast_ybindir}/autoyast-initscripts.sh