diff --git a/.gitignore b/.gitignore
index a2e9b65..876fef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-wsjtx-*.tgz
+/wsjtx-*.tgz
diff --git a/sources b/sources
index 8e1a17d..5a56b3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wsjtx-2.4.0.tgz) = c40e145ccab9e7339046994a08394f5a41604762e7998431648beb4b7c3067a87e32e346e3fb74615f7be64c71151c80286ffb217589f1f7e276dcc4761a9406
+SHA512 (wsjtx-2.5.0.tgz) = d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017
diff --git a/wsjtx-2.0.0-compile-fix.patch b/wsjtx-2.0.0-compile-fix.patch
deleted file mode 100644
index 37c3b57..0000000
--- a/wsjtx-2.0.0-compile-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: wsjtx-2.3.0-rc3/wsjtx/CMakeLists.txt
-===================================================================
---- wsjtx-2.3.0-rc3.orig/wsjtx/CMakeLists.txt
-+++ wsjtx-2.3.0-rc3/wsjtx/CMakeLists.txt
-@@ -855,7 +855,7 @@ find_package (FFTW3 COMPONENTS single th
- #
- # libhamlib setup
- #
--set (hamlib_STATIC 1)
-+set (hamlib_STATIC 1 CACHE BOOL "")
- find_package (hamlib 3 REQUIRED)
- find_program (RIGCTL_EXE rigctl)
- find_program (RIGCTLD_EXE rigctld)
-@@ -1545,27 +1545,6 @@ install (TARGETS ft8code jt65code qra64c
-   )
- endif(WSJT_BUILD_UTILS)  
- 
--install (PROGRAMS
--  ${RIGCTL_EXE}
--  DESTINATION ${CMAKE_INSTALL_BINDIR}
--  #COMPONENT runtime
--  RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
--  )
--
--install (PROGRAMS
--  ${RIGCTLD_EXE}
--  DESTINATION ${CMAKE_INSTALL_BINDIR}
--  #COMPONENT runtime
--  RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
--  )
--
--install (PROGRAMS
--  ${RIGCTLCOM_EXE}
--  DESTINATION ${CMAKE_INSTALL_BINDIR}
--  #COMPONENT runtime
--  RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
--  )
--
- install (FILES
-   README
-   COPYING
diff --git a/wsjtx.spec b/wsjtx.spec
index 9f1512c..3121cf6 100644
--- a/wsjtx.spec
+++ b/wsjtx.spec
@@ -1,8 +1,8 @@
 #global rctag rc4
 
 Name:           wsjtx
-Version:	    2.4.0
-Release:	    5%{?dist}
+Version:	    2.5.0
+Release:	    1%{?dist}
 Summary:	    Weak Signal communication by K1JT
 License:	    GPLv3+
 
@@ -26,6 +26,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	hamlib-devel
 BuildRequires:	fftw-devel
 BuildRequires:	libusbx-devel
+BuildRequires:	systemd-devel
 %if 0%{?rhel}
 BuildRequires:	boost169-devel
 %else
@@ -52,7 +53,6 @@ from the Moon.
 # remove bundled hamlib
 rm -f src/hamlib*.tgz* src/hamlib*.tar.gz*
 tar -xzf src/%{name}.tgz
-%patch0 -p1
 
 # remove archive
 rm -f src/wsjtx.tgz*
@@ -85,7 +85,7 @@ cd %{name}
        -DBoost_NO_SYSTEM_PATHS=FALSE \
 %if 0%{?rhel}
        -DBOOST_INCLUDEDIR=%{_includedir}/boost169 \
-	   -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \
+       -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \
        -DWSJT_GENERATE_DOCS=FALSE \
        -DWSJT_SKIP_MANPAGES=TRUE
 %endif
@@ -120,6 +120,8 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %endif
 
+# drop wsjtx hamlib bins
+rm -f %{buildroot}%{_bindir}/rigctl*-wsjtx
 
 %files
 %license COPYING
@@ -136,6 +138,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_bindir}/message_aggregator
 %{_bindir}/msk144code
 %{_bindir}/q65sim
+%{_bindir}/q65code
 %{_bindir}/udp_daemon
 %{_bindir}/wsjtx
 %{_bindir}/wsjtx_app_version
@@ -149,6 +152,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Wed Oct 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.0-1
+- New version
+  Resolves: rhbz#2008230
+
 * Tue Oct 12 2021 Richard Shaw <hobbes1069@gmail.com> - 2.4.0-5
 - Rebuild for hamlib 4.3.1.