diff --git a/sources b/sources
index 099c406..55f096b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wsjtx-2.2.2.tgz) = 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
+SHA512 (wsjtx-2.3.0.tgz) = 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
diff --git a/wsjtx-2.0.0-compile-fix.patch b/wsjtx-2.0.0-compile-fix.patch
index f442c25..37c3b57 100644
--- a/wsjtx-2.0.0-compile-fix.patch
+++ b/wsjtx-2.0.0-compile-fix.patch
@@ -1,17 +1,8 @@
-Index: wsjtx-2.2.2/wsjtx/CMakeLists.txt
+Index: wsjtx-2.3.0-rc3/wsjtx/CMakeLists.txt
 ===================================================================
---- wsjtx-2.2.2.orig/wsjtx/CMakeLists.txt
-+++ wsjtx-2.2.2/wsjtx/CMakeLists.txt
-@@ -852,7 +852,7 @@ find_program(ETAGS etags)
- #
- # Boost
- #
--set (Boost_NO_SYSTEM_PATHS TRUE)
-+set (Boost_NO_SYSTEM_PATHS TRUE CACHE BOOL "")
- if (Boost_NO_SYSTEM_PATHS)
-   set (BOOST_ROOT ${PROJECT_SOURCE_DIR}/boost)
- endif ()
-@@ -871,7 +871,7 @@ find_package (FFTW3 COMPONENTS double si
+--- 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
  #
@@ -20,7 +11,7 @@ Index: wsjtx-2.2.2/wsjtx/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1491,27 +1491,6 @@ install (TARGETS ft8code jt65code qra64c
+@@ -1545,27 +1545,6 @@ install (TARGETS ft8code jt65code qra64c
    )
  endif(WSJT_BUILD_UTILS)  
  
diff --git a/wsjtx.spec b/wsjtx.spec
index 97823b8..eb4eece 100644
--- a/wsjtx.spec
+++ b/wsjtx.spec
@@ -1,8 +1,8 @@
-#global rctag rc6
+#global rctag rc4
 
 Name:           wsjtx
-Version:	    2.2.2
-Release:	    6%{?dist}
+Version:	    2.3.0
+Release:	    1%{?dist}
 Summary:	    Weak Signal communication by K1JT
 License:	    GPLv3+
 
@@ -12,15 +12,29 @@ Source100:	    wsjtx.appdata.xml
 
 Patch0:		    wsjtx-2.0.0-compile-fix.patch
 
-BuildRequires:	dos2unix, tar, cmake, gcc-c++, gcc-gfortran
+BuildRequires:	cmake
+BuildRequires:	dos2unix
+BuildRequires:	tar
+BuildRequires:	gcc-c++
+BuildRequires:	gcc-gfortran
+
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qtserialport-devel
 BuildRequires:	qt5-qtmultimedia-devel
-BuildRequires:	desktop-file-utils, hamlib-devel, fftw-devel, libusbx-devel
-BuildRequires:	boost-devel, portaudio-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	hamlib-devel
+BuildRequires:	fftw-devel
+BuildRequires:	libusbx-devel
+%if 0%{?rhel}
+BuildRequires:	boost169-devel
+%else
+BuildRequires:	boost-devel
+%endif
+BuildRequires:	portaudio-devel
 %if 0%{?fedora}
-BuildRequires:	asciidoc, rubygem-asciidoctor
+BuildRequires:	asciidoc
+BuildRequires:	rubygem-asciidoctor
 BuildRequires:	libappstream-glib
 %endif
 
@@ -45,13 +59,13 @@ rm -f src/wsjtx.tgz*
 
 cd %{name}
 
-%if 0%{?fedora}
+%if ! 0%{?rhel} < 8
 # remove bundled boost. EL 7 is not required version.
 rm -rf boost
 %endif
 
 # convert CR + LF to LF
-dos2unix *.ui *.iss *.rc *.txt
+dos2unix *.ui *.iss *.txt
 
 
 %build
@@ -68,13 +82,14 @@ export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 
 cd %{name}
 %cmake -Dhamlib_STATIC=FALSE \
-%if 0%{?fedora}
        -DBoost_NO_SYSTEM_PATHS=FALSE \
-%else
-       -DBoost_NO_SYSTEM_PATHS=TRUE \
+%if 0%{?rhel}
+       -DBOOST_INCLUDEDIR=%{_includedir}/boost169 \
+	   -DBOOST_LIBRARYDIR=%{_libdir}/boost169 \
        -DWSJT_GENERATE_DOCS=FALSE \
        -DWSJT_SKIP_MANPAGES=TRUE
 %endif
+
 %cmake_build
 
 
@@ -89,16 +104,15 @@ desktop-file-edit --set-key=Exec --set-value="wsjtx --style=fusion" \
 desktop-file-validate %{buildroot}%{_datadir}/applications/wsjtx.desktop
 desktop-file-validate %{buildroot}%{_datadir}/applications/message_aggregator.desktop
 
+%if 0%{?fedora}
 # appdata file
 mkdir -p %{buildroot}%{_metainfodir}
 install -pm 0644 %{SOURCE100} %{buildroot}%{_metainfodir}/
+%endif
 
 # fix docs
-rm -f %{buildroot}%{_datadir}/doc/WSJT-X/{INSTALL,COPYING,copyright,changelog.Debian.gz}
-mv %{buildroot}%{_datadir}/doc/WSJT-X %{buildroot}%{_datadir}/doc/%{name}
 install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.txt \
-  mouse_commands.txt prefixes.txt shortcuts.txt v1.7_Features.txt \
-  wsjtx_changelog.txt
+  v1.7_Features.txt wsjtx_changelog.txt
 
 
 %if 0%{?fedora}
@@ -113,6 +127,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_bindir}/fcal
 %{_bindir}/fmeasure
 %{_bindir}/fmtave
+%{_bindir}/fst4sim
 %{_bindir}/jt4code
 %{_bindir}/jt65code
 %{_bindir}/jt9
@@ -124,6 +139,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_bindir}/qra64sim
 %{_bindir}/udp_daemon
 %{_bindir}/wsjtx
+%{_bindir}/wsjtx_app_version
 %{_bindir}/wsprd
 %{?fedora:%{_mandir}/man1/*.1.gz}
 %{?fedora:%{_metainfodir}/*.xml}
@@ -134,6 +150,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Wed Feb 03 2021 Richard Shaw <hobbes1069@gmail.com> - 2.3.0-1
+- Update to 2.3.0 final.
+
+* Mon Jan 25 2021 Richard Shaw <hobbes1069@gmail.com> - 2.3.0-0.4
+- Update to 2.3.0 RC4.
+
 * Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 2.2.2-6
 - Rebuilt for hamlib 4.0 release.