diff --git a/kde-base/kstars/kstars-3.5.5.recipe b/kde-base/kstars/kstars-3.5.8.recipe
similarity index 96%
rename from kde-base/kstars/kstars-3.5.5.recipe
rename to kde-base/kstars/kstars-3.5.8.recipe
index 7e290499c..a1282dc68 100644
--- a/kde-base/kstars/kstars-3.5.5.recipe
+++ b/kde-base/kstars/kstars-3.5.8.recipe
@@ -8,11 +8,11 @@ For students and teachers, it supports adjustable simulation speeds in order to
 phenomena that happen over long timescales, the KStars Astrocalculator to predict \
 conjunctions, and many common astronomical calculations."
 HOMEPAGE="https://edu.kde.org/kstars"
-COPYRIGHT="2010-2021 KDE Organisation"
+COPYRIGHT="2010-2022 KDE Organisation"
 LICENSE="GNU LGPL v2"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/kstars/kstars-$portVersion.tar.xz"
-CHECKSUM_SHA256="703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43"
+CHECKSUM_SHA256="660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f"
 PATCHES="kstars-$portVersion.patchset"
 ADDITIONAL_FILES="kstars.rdef.in"
 
@@ -78,7 +78,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix >= 5.86
+	extra_cmake_modules$secondaryArchSuffix >= 5.93
 	devel:eigen$secondaryArchSuffix
 	devel:libkdeinit5_kded5$secondaryArchSuffix
 	devel:libkdeinit5_klauncher$secondaryArchSuffix
@@ -121,7 +121,7 @@ BUILD_REQUIRES="
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:liblcms2$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.15
+	devel:libQt5Core$secondaryArchSuffix
 	devel:libraw$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -146,6 +146,7 @@ BUILD()
 		-DSHARE_INSTALL_PREFIX=$dataDir \
 		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
 		-DBUILD_DOC=OFF
+
 	make $jobArgs
 }
 
diff --git a/kde-base/kstars/patches/kstars-3.5.5.patchset b/kde-base/kstars/patches/kstars-3.5.8.patchset
similarity index 80%
rename from kde-base/kstars/patches/kstars-3.5.5.patchset
rename to kde-base/kstars/patches/kstars-3.5.8.patchset
index 9780cbe20..52a5b5944 100644
--- a/kde-base/kstars/patches/kstars-3.5.5.patchset
+++ b/kde-base/kstars/patches/kstars-3.5.8.patchset
@@ -1,14 +1,14 @@
-From 7d61173d5c416f707804c7ffad6b2aaea32f3a3d Mon Sep 17 00:00:00 2001
+From 7a4fa592b7294815a499ad1991095d26db5a1347 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 1 Nov 2021 11:59:42 +1000
 Subject: Fix build for Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aada9ad..4d14564 100644
+index a91683a..550d0c8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -312,6 +312,19 @@ if (ANDROID)
+@@ -308,6 +308,19 @@ if (ANDROID)
  endif ()
  
  # Add security (hardening flags)
@@ -28,7 +28,7 @@ index aada9ad..4d14564 100644
  IF (UNIX OR APPLE OR ANDROID)
      SET(SEC_COMP_FLAGS "-D_FORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align -fPIE")
      IF (NOT ANDROID AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE)
-@@ -333,6 +346,7 @@ IF (UNIX OR APPLE OR ANDROID)
+@@ -329,6 +342,7 @@ IF (UNIX OR APPLE OR ANDROID)
      SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SEC_LINK_FLAGS}")
      SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SEC_LINK_FLAGS}")
  ENDIF ()
@@ -36,7 +36,7 @@ index aada9ad..4d14564 100644
  
  # Clang Format support
  IF (UNIX OR APPLE)
-@@ -464,9 +478,11 @@ IF (NOT ANDROID)
+@@ -460,9 +474,11 @@ IF (NOT ANDROID)
          ki18n_install("${CMAKE_CURRENT_BINARY_DIR}/po")
      else()
          ki18n_install(po)
@@ -52,10 +52,10 @@ index aada9ad..4d14564 100644
      endif()
  ENDIF ()
 diff --git a/kstars/auxiliary/thememanager.cpp b/kstars/auxiliary/thememanager.cpp
-index ffe7dba..c99fb52 100644
+index caa36c3..8f06517 100644
 --- a/kstars/auxiliary/thememanager.cpp
 +++ b/kstars/auxiliary/thememanager.cpp
-@@ -154,9 +154,11 @@ void Manager::slotChangePalette()
+@@ -140,9 +140,11 @@ void Manager::slotChangePalette()
      if (theme == "Macintosh" || theme == "White Balance" || theme == "High Key" || (theme == "Default"
              && currentDesktopdefaultTheme().contains("Dark") == false))
          themeIconType = BREEZE_THEME;
@@ -69,7 +69,7 @@ index ffe7dba..c99fb52 100644
      QString filename        = d->themeMap.value(theme);
      KSharedConfigPtr config = KSharedConfig::openConfig(filename);
      // hint for the style to synchronize the color scheme with the window manager/compositor
-@@ -178,6 +180,10 @@ void Manager::slotChangePalette()
+@@ -164,6 +166,10 @@ void Manager::slotChangePalette()
  
      if(theme == "Macintosh")
          qApp->setStyle(QStyleFactory::create("macintosh"));
@@ -80,7 +80,7 @@ index ffe7dba..c99fb52 100644
      else
      {
          if (qgetenv("XDG_CURRENT_DESKTOP") != "KDE")
-@@ -414,6 +420,12 @@ void Manager::setIconTheme(IconTheme theme)
+@@ -400,6 +406,12 @@ void Manager::setIconTheme(IconTheme theme)
      QString resourcePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "icons",
                             QStandardPaths::LocateDirectory) + QDir::separator() + iconTheme + QDir::separator() + rccFile;
      QResource::registerResource(resourcePath, "/icons/" + iconTheme);
@@ -94,10 +94,10 @@ index ffe7dba..c99fb52 100644
      // On Linux on non-KDE Distros, find out if the themes are installed or not and perhaps warn the user
      // The important point is that the current theme must be left as is to avoid empty icons
 diff --git a/kstars/auxiliary/thememanager.h b/kstars/auxiliary/thememanager.h
-index 8eafbfa..09bab99 100644
+index ca6eeb1..d29faa6 100644
 --- a/kstars/auxiliary/thememanager.h
 +++ b/kstars/auxiliary/thememanager.h
-@@ -42,7 +42,7 @@ class Manager : public QObject
+@@ -28,7 +28,7 @@ class Manager : public QObject
  
  public:
  
@@ -107,7 +107,7 @@ index 8eafbfa..09bab99 100644
      ~Manager();
      static Manager* instance();
 diff --git a/kstars/htmesh/SpatialGeneral.h b/kstars/htmesh/SpatialGeneral.h
-index fa3ae42..660498a 100644
+index d87c9b0..09d6ae9 100644
 --- a/kstars/htmesh/SpatialGeneral.h
 +++ b/kstars/htmesh/SpatialGeneral.h
 @@ -101,7 +101,7 @@ const float64 gEpsilon = 1.0E-15;
@@ -120,10 +120,10 @@ index fa3ae42..660498a 100644
  #endif
  
 diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
-index 3796dc8..46ff7be 100644
+index ecc52c1..6d170c7 100644
 --- a/kstars/kstars.cpp
 +++ b/kstars/kstars.cpp
-@@ -71,7 +71,7 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate)
+@@ -60,7 +60,7 @@ KStars::KStars(bool doSplash, bool clockrun, const QString &startdate)
      setWindowTitle(i18nc("@title:window", "KStars"));
  
      // Set thread stack size to 32MB
@@ -135,3 +135,28 @@ index 3796dc8..46ff7be 100644
 -- 
 2.30.2
 
+
+From 3b9dfa4003ceadc676eb8b581522f2a2ab40bbee Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 10 May 2022 21:40:56 +1000
+Subject: Use software QML renderer
+
+
+diff --git a/kstars/main.cpp b/kstars/main.cpp
+index 59bdf5c..5a70c94 100644
+--- a/kstars/main.cpp
++++ b/kstars/main.cpp
+@@ -56,6 +56,10 @@ Q_DECL_EXPORT
+ #endif
+ int main(int argc, char *argv[])
+ {
++#if defined(Q_OS_HAIKU)
++	setenv("QMLSCENE_DEVICE", "softwarecontext", 0);
++#endif
++
+ #if defined(Q_OS_LINUX) || defined(Q_OS_OSX)
+     // Ignore SIGPIPE
+     signal(SIGPIPE, SIG_IGN);
+-- 
+2.30.2
+