diff --git a/.gitignore b/.gitignore
index c8950cf..a537102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
 /qcad-3.28.0.0.tar.gz
 /qcad-3.28.1.0.tar.gz
 /qcad-3.28.2.2.tar.gz
+/qcad-3.28.2.0.zip
diff --git a/qcad-qt5-unbundle_libraries.patch b/qcad-qt5-unbundle_libraries.patch
deleted file mode 100644
index 1ef2bb7..0000000
--- a/qcad-qt5-unbundle_libraries.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN shared.pri qcad-3.15.6.1-new/shared.pri
---- shared.pri	2016-12-01 10:40:01.000000000 +0100
-+++ shared.pri	2016-12-18 21:03:22.059514509 +0100
-@@ -164,10 +164,10 @@ QMAKE_TARGET_DESCRIPTION = QCAD Applicat
- QMAKE_TARGET_COPYRIGHT = 
- QMAKE_TARGET_PRODUCT = QCAD Application Framework
- 
--DESTDIR = $$PWD/$$ROUTDIR
-+DESTDIR = $$shadowed($$PWD)/$$ROUTDIR
- UI_DIR = .ui
- 
--LIBS += -L$$PWD/$$ROUTDIR
-+LIBS += -L$$shadowed($$PWD)/$$ROUTDIR
- 
- CONFIG(debug, debug|release) {
-     !win32 {
-diff -rupN src/spatialindex/RSpatialIndexNavel.h qcad-3.15.6.1-new/src/spatialindex/RSpatialIndexNavel.h
---- src/spatialindex/RSpatialIndexNavel.h	2016-12-01 10:40:01.000000000 +0100
-+++ src/spatialindex/RSpatialIndexNavel.h	2016-12-18 21:04:31.387312658 +0100
-@@ -31,7 +31,7 @@
- 
- #include "RSpatialIndex.h"
- 
--#include "include/spatialindex/SpatialIndex.h"
-+#include "spatialindex/SpatialIndex.h"
- 
- class RSiDataStream : public SpatialIndex::IDataStream
- {
diff --git a/qcad.spec b/qcad.spec
index aaf061d..2f8c94d 100644
--- a/qcad.spec
+++ b/qcad.spec
@@ -9,8 +9,9 @@
 #
 
 Name:    qcad
-Version: 3.28.2.2
+Version: 3.28.2.0
 Release: %autorelease
+Epoch:   1
 Summary: Powerful 2D CAD system
 
 ## Main license: GPLv3
@@ -28,8 +29,8 @@ Summary: Powerful 2D CAD system
 ## Other fonts in directory 'fonts' are released as public domain (all copyright
 ## is waived) and BSD (3-clauses).
 
-License: GPL-3.0-only and GPL-2.0-or-later and MIT and BSD and Public Domain and CC-BY-3.0 and Hershey
-Source0: https://github.com/qcad/qcad/archive/v%{version}/%{name}-%{version}.tar.gz
+License: GPL-3.0-only AND GPL-2.0-or-later AND MIT AND BSD AND Public Domain AND CC-BY-3.0 AND Hershey
+Source0: https://github.com/qcad/qcad/archive/v%{version}/%{name}-%{version}.zip
 Source1: %{name}.desktop
 Source2: %{name}.appdata.xml
 URL: https://www.qcad.org/
@@ -45,7 +46,7 @@ BuildRequires: qt5-qtdeclarative-devel >= 5.9.0
 Requires: qt5-designer%{?_isa} >= 5.9.0
 Requires: qt5-qtsvg%{?_isa}
 Requires: qt5-qtscript%{?_isa}
-Provides: bundled(qtscriptgenerator) = 5.9.0
+Provides: bundled(qtscriptgenerator) = 5.15.11
 BuildRequires: gcc-c++, chrpath
 %if %{with cmake}
 BuildRequires: cmake
@@ -60,7 +61,6 @@ BuildRequires: make
 BuildRequires: openssl-devel
 BuildRequires: dbus-devel
 BuildRequires: mesa-libGLU-devel
-BuildRequires: spatialindex-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libappstream-glib
 BuildRequires: fontpackages-devel
@@ -74,9 +74,9 @@ Requires: dejavu-sans-fonts
 Provides: bundled(dxflib) = 1.0.0
 Provides: bundled(opennurbs) = 201004095
 Provides: bundled(stemmer) = 1.0.0
-
-## Unbundle spatialindex libraries
-Patch0: %{name}-qt5-unbundle_libraries.patch
+# Unbundling this library may cause crashes of the software
+Provides: bundled(spatialindex) = 1.9.1
+Provides: bundled(spatialindexnavel) = 1.9.1
 
 %description
 QCAD is an application for computer aided drafting (CAD) in two dimensions (2D).
@@ -91,16 +91,12 @@ You dont need any CAD experience to get started with QCAD immediately.
 %prep
 %setup -n %{name}-%{version} -q
 
-%patch -P 0 -p0 -b .backup
-
 rm -rf ../*-SPECPARTS
 
-rm -rf src/3rdparty/spatialindexnavel/include/*
-
 # Use Fedora Qt5 scripts
-cp -a src/3rdparty/qt-labs-qtscriptgenerator-5.15.3 src/3rdparty/qt-labs-qtscriptgenerator-5.15.10
-mv src/3rdparty/qt-labs-qtscriptgenerator-5.15.10/qt-labs-qtscriptgenerator-5.15.3.pro \
- src/3rdparty/qt-labs-qtscriptgenerator-5.15.10/qt-labs-qtscriptgenerator-5.15.10.pro
+cp -a src/3rdparty/qt-labs-qtscriptgenerator-5.15.3 src/3rdparty/qt-labs-qtscriptgenerator-5.15.11
+mv src/3rdparty/qt-labs-qtscriptgenerator-5.15.11/qt-labs-qtscriptgenerator-5.15.3.pro \
+ src/3rdparty/qt-labs-qtscriptgenerator-5.15.11/qt-labs-qtscriptgenerator-5.15.11.pro
 
 %build
 # QT is known not to work properly with LTO at this point.  Some of the issues
diff --git a/sources b/sources
index b7f8148..7dd206d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qcad-3.28.2.2.tar.gz) = 2e4b677d73ae5ae3d639d3f92d4800862df0551ab3e4b0c79c4a946db84fd5124f17376cbcd76ea3a5688e29c2f50573843d6e9bbd5fe916d5945e999e1ed64e
+SHA512 (qcad-3.28.2.0.zip) = 67396379b9af6df48ebeee153b9d0239faf33dd1c17eadef727de214439dfddeb645cb36622eb090993f2a31da03f6c76a6c0d0d6587e472c92d2e34f5cf4fa0