diff --git a/.gitignore b/.gitignore
index c62f4f8..349f75c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ TrustedQSL-1.11.tar.gz
 /tqsl-2.0.1.tar.gz
 /tqsl-2.0.2.tar.gz
 /tqsl-2.0.3.tar.gz
+/tqsl-2.2.1.tar.gz
diff --git a/sources b/sources
index a63bc2f..c509e10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33a44e02a6c316a87ce755024af87298  tqsl-2.0.3.tar.gz
+654b29f94f91c3d1f7bcacca152b171e  tqsl-2.2.1.tar.gz
diff --git a/tqsl-2.0.1-gcc44_pragma.patch b/tqsl-2.0.1-gcc44_pragma.patch
deleted file mode 100644
index b9fe372..0000000
--- a/tqsl-2.0.1-gcc44_pragma.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur tqsl-2.0.1.orig/apps/tqsl.cpp tqsl-2.0.1/apps/tqsl.cpp
---- tqsl-2.0.1.orig/apps/tqsl.cpp	2013-12-15 07:54:43.000000000 -0600
-+++ tqsl-2.0.1/apps/tqsl.cpp	2013-12-18 11:17:51.463517659 -0600
-@@ -2936,13 +2936,7 @@
- // The macro for declaring a hash map defines a couple of typedefs
- // that it never uses. Current GCC warns about those. The pragma
- // below suppresses those warnings for those.
--#if !defined(__APPLE__) && !defined(_WIN32)
--	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
--#endif
- 			WX_DECLARE_STRING_HASH_MAP(wxString, URLHashMap);
--#if !defined(__APPLE__) && !defined(_WIN32)
--	#pragma GCC diagnostic warning "-Wunused-local-typedefs"
--#endif
- 			URLHashMap map;
- 			ri->newProgramRev = NULL;
- 			ri->newConfigRev = NULL;
diff --git a/tqsl-ssl-md5.patch b/tqsl-ssl-md5.patch
deleted file mode 100644
index 82000de..0000000
--- a/tqsl-ssl-md5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Workaround for F21+ disabling MD5 certificate verification.
-https://bugzilla.redhat.com/show_bug.cgi?id=1202157
-
-diff -Naur tqsl-2.0.3.orig/src/tqsllib.cpp tqsl-2.0.3/src/tqsllib.cpp
---- tqsl-2.0.3.orig/src/tqsllib.cpp	2014-07-27 09:18:58.000000000 -0500
-+++ tqsl-2.0.3/src/tqsllib.cpp	2015-03-18 07:40:56.110923223 -0500
-@@ -156,6 +156,10 @@
- 	int wval;
- #endif
- 
-+#if !defined(_WIN32) && !defined(__APPLE__)
-+   setenv("OPENSSL_ENABLE_MD5_VERIFY", "1", 0);
-+#endif
-+
- 	/* OpenSSL API tends to change between minor version numbers, so make sure
- 	 * we're using the right version */
- 	long SSLver = SSLeay();
diff --git a/trustedqsl.spec b/trustedqsl.spec
index 2a9fb45..8419e96 100644
--- a/trustedqsl.spec
+++ b/trustedqsl.spec
@@ -3,18 +3,17 @@
 # numbers change, otherwise the NEVR of the library may cause a package not to
 # be updated even if it should be.
 %global srcname tqsl
-%global tqslver 2.0.3
-%global libtqslver 2.4
+%global tqslver 2.2.1
+%global libtqslver 2.5
 # The tsql library needs to maintain it's own release version otherwise it 
 # would not be "newer" than the installed version when the application release
 # resets to 1.
-%global tqslrel 11%{?dist}
-%global libtqslrel 11%{?dist}
+%global libtqslrel 2%{?dist}
 
 
 Name:           trustedqsl
 Version:        %{tqslver}
-Release:        %{tqslrel}.1
+Release:        1%{?dist}
 Summary:        TrustedQSL ham-radio applications
 License:        BSD
 URL:            http://sourceforge.net/projects/trustedqsl/
@@ -23,11 +22,9 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{srcname}-%{version}.t
 
 Patch0:         tqsl-2.0-rpath.patch
 Patch1:         tqsl-tqsllib.patch
-Patch2:         tqsl-2.0.1-gcc44_pragma.patch
-Patch3:         tqsl-ssl-md5.patch
 
 BuildRequires:  cmake
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 7
 BuildRequires:  db4-devel
 %else
 BuildRequires:  libdb-devel
@@ -48,7 +45,7 @@ contains the GUI applications tqslcert and tqsl.
 
 %package -n tqsllib
 Version:        %libtqslver
-Release:        %{libtqslrel}.1
+Release:        %{libtqslrel}
 Summary:        TrustedQSL library
 
 %description -n tqsllib
@@ -59,7 +56,7 @@ TrustedQSL applications.
 
 %package -n tqsllib-devel
 Version:        %libtqslver
-Release:        %{libtqslrel}.1
+Release:        %{libtqslrel}
 Summary:        Development files the for TrustedQSL library
 Requires:       tqsllib%{?_isa} = %{version}-%{libtqslrel}
 
@@ -73,10 +70,6 @@ contains the to develop with tqsllib.
 %setup -q -n %{srcname}-%{tqslver}
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .soname
-%if 0%{?rhel}
-%patch2 -p1 -b .pragma
-%endif
-%patch3 -p1
 
 
 %build
@@ -92,6 +85,11 @@ pushd build
 %make_install
 popd
 
+# Remove bundled language file that shouldn't be there.
+find %{buildroot}%{_datadir}/locale/ -type f -name wxstd.mo -exec rm -f {} \;
+
+%find_lang tqslapp
+
 # Install desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e "s/.png//g" -e "s/Application;/Network;/g" -e "s/Utility;/GTK;/g" apps/tqsl.desktop
@@ -106,11 +104,9 @@ done
 
 
 %post
-/sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -119,9 +115,16 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+%post -n tqsllib
+/sbin/ldconfig
 
-%files
-%doc AUTHORS.txt LICENSE.txt README
+%postun -n tqsllib
+/sbin/ldconfig
+
+
+%files -f tqslapp.lang
+%license LICENSE.txt
+%doc AUTHORS.txt README
 %{_bindir}/tqsl
 %{_datadir}/applications/tqsl.desktop
 %{_datadir}/icons/hicolor/*/apps/TrustedQSL.png
@@ -139,6 +142,9 @@ fi
 
 
 %changelog
+* Thu Mar 24 2016 Richard Shaw <hobbes1069@gmail.com> - 2.2.1-1
+- Update to latest upstream release.
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.3-11.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild