diff --git a/.gitignore b/.gitignore
index 355aaa4..d4c8945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /kmix-20.08.3.tar.xz
 /kmix-20.12.2.tar.xz
 /kmix-20.12.3.tar.xz
+/kmix-21.04.0.tar.xz
diff --git a/kmix-18.08.1-autostart_disable.patch b/kmix-18.08.1-autostart_disable.patch
deleted file mode 100644
index d11c757..0000000
--- a/kmix-18.08.1-autostart_disable.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up kmix-18.08.1/core/GlobalConfig.cpp.autostart_disable kmix-18.08.1/core/GlobalConfig.cpp
---- kmix-18.08.1/core/GlobalConfig.cpp.autostart_disable	2018-08-27 00:41:51.000000000 -0500
-+++ kmix-18.08.1/core/GlobalConfig.cpp	2018-09-16 10:02:31.984742827 -0500
-@@ -43,7 +43,7 @@ GlobalConfig::GlobalConfig() :
- //	addItemBool("TrayVolumeControl", data.trayVolumePopupEnabled, true); // removed support in KDE4.13. Always active!
- 
- 	// Startup
--	addItemBool("AutoStart", data.allowAutostart, true);
-+	addItemBool("AutoStart", data.allowAutostart, false);
- 	addItemBool("VolumeFeedback", data.volumeFeedback, true);
- 	addItemBool("startkdeRestore", data.startkdeRestore, true);
- 
-diff -up kmix-18.08.1/desktop/kmix_autostart.desktop.autostart_disable kmix-18.08.1/desktop/kmix_autostart.desktop
---- kmix-18.08.1/desktop/kmix_autostart.desktop.autostart_disable	2018-08-27 00:41:51.000000000 -0500
-+++ kmix-18.08.1/desktop/kmix_autostart.desktop	2018-09-16 10:02:31.984742827 -0500
-@@ -9,7 +9,7 @@ X-KDE-autostart-after=panel
- X-KDE-autostart-after=pulseaudio
- X-KDE-StartupNotify=false
- X-DBUS-StartupType=Unique
--X-KDE-autostart-condition=kmixrc:Global:AutoStart:true
-+X-KDE-autostart-condition=kmixrc:Global:AutoStart:false
- Icon=kmix
- GenericName=Sound Mixer
- GenericName[bg]=Звуков смесител
diff --git a/kmix-21.04.0-autostart_disable.patch b/kmix-21.04.0-autostart_disable.patch
new file mode 100644
index 0000000..8d587f2
--- /dev/null
+++ b/kmix-21.04.0-autostart_disable.patch
@@ -0,0 +1,24 @@
+diff -up kmix-21.04.0/core/settings.kcfg.autostart_disable kmix-21.04.0/core/settings.kcfg
+--- kmix-21.04.0/core/settings.kcfg.autostart_disable	2021-04-28 16:34:04.623152452 -0500
++++ kmix-21.04.0/core/settings.kcfg	2021-04-28 16:31:03.076698930 -0500
+@@ -57,7 +57,7 @@
+     <!-- Set by KMixPrefDlg, read by kmix_autostart.desktop	-->
+ 
+     <entry name="AutoStart" type="Bool">
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+ 
+     <!-- Saved by KMixWindow::saveBaseConfig() and loaded	-->
+diff -up kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable kmix-21.04.0/desktop/kmix_autostart.desktop
+--- kmix-21.04.0/desktop/kmix_autostart.desktop.autostart_disable	2021-04-28 16:34:18.456263203 -0500
++++ kmix-21.04.0/desktop/kmix_autostart.desktop	2021-04-28 16:32:58.722624829 -0500
+@@ -8,7 +8,7 @@ X-KDE-autostart-after=panel
+ X-KDE-autostart-after=pulseaudio
+ X-KDE-StartupNotify=false
+ X-DBUS-StartupType=Unique
+-X-KDE-autostart-condition=kmixrc:Global:AutoStart:true
++X-KDE-autostart-condition=kmixrc:Global:AutoStart:false
+ Icon=kmix
+ GenericName=Sound Mixer
+ GenericName[bg]=Звуков смесител
diff --git a/kmix.spec b/kmix.spec
index 1ed5fa4..c087657 100644
--- a/kmix.spec
+++ b/kmix.spec
@@ -1,14 +1,12 @@
-%undefine __cmake_in_source_build
-
 Name:    kmix 
 Summary: KDE volume control 
-Version: 20.12.3
+Version: 21.04.0
 Release: 1%{?dist}
 
 # code is LGPLv2+ except for gui/osdwidget.* which is GPLv2+
 # docs GFDL
 License: GPLv2+ and GFDL
-URL:     https://cgit.kde.org/%{name}.git
+URL:     https://invent.kde.org/multimedia/%{name}
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -22,7 +20,7 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name
 
 ## upstreamable patches
 # disable autostart by default (on newer plasma releases that use plasma-pa)
-Patch2:  kmix-18.08.1-autostart_disable.patch
+Patch2:  kmix-21.04.0-autostart_disable.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libappstream-glib
@@ -60,13 +58,12 @@ Conflicts: kde-l10n < 17.03
 
 
 %prep
-%setup -q
-
-%patch2 -p1 -b .autostart_disable
+%autosetup -p1
 
 
 %build
-%{cmake_kf5}
+%cmake_kf5
+
 %cmake_build
 
 
@@ -83,7 +80,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kmix.desktop
 
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog TODO
-%license COPYING
+%license COPYING*
 %{_datadir}/dbus-1/interfaces/org.kde.kmix.control.xml
 %{_datadir}/dbus-1/interfaces/org.kde.kmix.mixer.xml
 %{_datadir}/dbus-1/interfaces/org.kde.kmix.mixset.xml
@@ -95,8 +92,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kmix.desktop
 %{_kf5_metainfodir}/org.kde.kmix.appdata.xml
 %{_kf5_datadir}/kmix/
 %{_kf5_datadir}/kxmlgui5/kmix/
-#{_kf5_libdir}/libkdeinit5_kmix.so
-#{_kf5_libdir}/libkdeinit5_kmixctrl.so
 %{_kf5_datadir}/kservices5/plasma-dataengine-mixer.desktop
 %{_kf5_datadir}/plasma/services/mixer.operations
 %{_sysconfdir}/xdg/autostart/restore_kmix_volumes.desktop
@@ -110,6 +105,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kmix.desktop
 
 
 %changelog
+* Mon Apr 19 2021 Rex Dieter <rdieter@fedoraproject.org> - 21.04.0-1
+- 21.04.0
+
 * Wed Mar 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 20.12.3-1
 - 20.12.3
 
diff --git a/sources b/sources
index 30be2d0..a443d4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kmix-20.12.3.tar.xz) = cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
+SHA512 (kmix-21.04.0.tar.xz) = 447754bd4fc919ea7c36deadf839dc014cf20791b85545b01ed7cfb84d54a26035dc32d93b2a31466f9556be81eab4445e95ecd65e2507c1f060b9b40193b609