diff --git a/.gitignore b/.gitignore
index 8789576..dfdb589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
 /CopyQ-3.11.1.tar.gz
 /CopyQ-3.12.0.tar.gz
 /CopyQ-3.13.0.tar.gz
+/CopyQ-45c9508ae80ad210adc0eaebf200df715674ee1d.tar.gz
diff --git a/copyq.spec b/copyq.spec
index a906800..1dc2526 100644
--- a/copyq.spec
+++ b/copyq.spec
@@ -1,32 +1,44 @@
-%global project		CopyQ
-Name:		copyq	
-Summary:	Advanced clipboard manager
-Version:	3.13.0
-Release:	3%{?dist}
-License:	GPLv3+
-Url:		https://hluk.github.io/%{project}/
-Source0:	https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz
-Source1:	%{name}.rpmlintrc
-BuildRequires:	libXtst-devel, libXfixes-devel, desktop-file-utils
-BuildRequires:	kf5-rpm-macros, qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel
-BuildRequires:	qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel, qt5-qtx11extras-devel
-BuildRequires:	extra-cmake-modules, appstream-qt-devel, libappstream-glib
+%global forgeurl https://github.com/hluk/CopyQ/
+%global commit 45c9508ae80ad210adc0eaebf200df715674ee1d
+
+Name:    copyq
+Version: 4.0.0
+Release: 1%{?dist}
+Summary: Advanced clipboard manager
+License: GPLv3+
+
+%{forgemeta}
+
+Url:     %{forgeurl}
+Source0: %{forgesource}
+Source1: %{name}.rpmlintrc
+BuildRequires: cmake, extra-cmake-modules, gcc-c++
+BuildRequires: appstream-qt-devel, libappstream-glib
+BuildRequires: desktop-file-utils, git
+BuildRequires: libXtst-devel, libXfixes-devel
+BuildRequires: kf5-knotifications-devel, kf5-rpm-macros,
+BuildRequires: qt5-qtbase-devel, qt5-qtbase-private-devel
+BuildRequires: qt5-qtsvg-devel, qt5-qtdeclarative-devel
+BuildRequires: qt5-qttools-devel, qt5-qtscript-devel
+BuildRequires: qwt-qt5-devel, qt5-qtx11extras-devel
+BuildRequires: wayland-devel, qt5-qtwayland-devel
 
 %description
 CopyQ is advanced clipboard manager with searchable and editable history with
 support for image formats, command line control and more.
 
 %prep
+%{forgesetup}
 chmod 644 %{SOURCE0}
-%setup -qn %{project}-%{version}
+%autosetup -n %{archivename}
 sed -i '/DQT_RESTRICTED_CAST_FROM_ASCII/d' CMakeLists.txt
 
 %build
 %cmake_kf5 \
-				-DWITH_QT5=ON \
-				-DWITH_TESTS=TRUE \
-				-DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \
-				-DTRANSLATION_INSTALL_PREFIX:PATH=%{_datadir}/%{name}/locale
+  -DWITH_QT5=ON \
+  -DWITH_TESTS=TRUE \
+  -DPLUGIN_INSTALL_PREFIX=%{_libdir}/%{name}/plugins \
+  -DTRANSLATION_INSTALL_PREFIX:PATH=%{_datadir}/%{name}/locale
 
 %cmake_build
 
@@ -39,12 +51,13 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.github.hluk.%{
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.github.hluk.%{name}.appdata.xml
 
 %files -f %{name}.lang
-%doc AUTHORS CHANGES HACKING README.md
+%doc AUTHORS CHANGES.md HACKING README.md
 %license LICENSE
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
 %{_datadir}/metainfo/com.github.hluk.%{name}.appdata.xml
 %{_datadir}/applications/com.github.hluk.%{name}.desktop
+%{_datadir}/bash-completion/completions/copyq
 %{_datadir}/icons/hicolor/*/apps/%{name}*.png
 %{_datadir}/icons/hicolor/*/apps/%{name}*.svg
 %dir %{_datadir}/%{name}/
@@ -53,6 +66,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.gi
 %{_mandir}/man1/%{name}.1.*
 
 %changelog
+* Sun Apr 11 2021 Gerald Cox <gbcox@fedoraproject.org> - 4.0.0-1
+- Upstream release rhbz#1948314
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 606acb8..fee2178 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (CopyQ-3.13.0.tar.gz) = 898d4501002202849f0b5302d7315e8c539f8b0f8d5198641b3d3a647839581841e2ef1e2519c690d3cc95f85fdc921c979f2879348184de42767d31e081c307
+SHA512 (CopyQ-45c9508ae80ad210adc0eaebf200df715674ee1d.tar.gz) = d294ccc0984ed29a85ac30598b5c49a8cd0385df84069f64bec3dabce6ba21a1bdf1527febfa55585d623581c1ac5f42826d83751f06c44f33702379183a11fb