diff --git a/.gitignore b/.gitignore
index 829b9db..92483cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /cqrlog-2.0.4.tar.gz
 /cqrlog-2.0.5.tar.gz
 /cqrlog-2.1.0.tar.gz
+/cqrlog-2.2.0.tar.gz
diff --git a/cqrlog-install.patch b/cqrlog-install.patch
index c47a2eb..ef898d2 100644
--- a/cqrlog-install.patch
+++ b/cqrlog-install.patch
@@ -9,7 +9,7 @@
  
  clean:
  	rm -f -v src/*.o src/*.ppu src/*.bak src/lnet/lib/*.ppu src/lnet/lib/*.o src/lnet/lib/*.bak src/cqrlog src/cqrlog.compiled debian/cqrlog.* src/ipc/*.o src/ipc/*.ppu src/cqrlog.or
- 	rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh  src/*.rst src/*.a
+ 	rm -f -v src/*.lrs src/*.ps src/*.lrt src/*.rsh  src/*.rst src/*.a src/synapse/*.a src/synapse/*.o src/synapse/*.ppu
  	rm -rf debian/cqrlog
  	rm -f -v src/mysql/*.ppu src/mysq/*.bak src/mysql/*.o
 -	rm -f -v tools/cqrlog.1.gz
diff --git a/cqrlog.spec b/cqrlog.spec
index db24f74..f939617 100644
--- a/cqrlog.spec
+++ b/cqrlog.spec
@@ -1,6 +1,6 @@
 Name:		cqrlog
-Version:	2.1.0
-Release:	2%{?dist}
+Version:	2.2.0
+Release:	1%{?dist}
 Summary:	An amateur radio contact logging program
 
 License:	GPLv2
@@ -9,9 +9,13 @@ Source0:	https://github.com/ok2cqr/cqrlog/archive/v%{version}/%{name}-%{version}
 
 Patch0:         cqrlog-install.patch
 Patch1:         cqrlog-desktop.patch
-Patch2:         cqrlog-debug.patch
 
 ExclusiveArch:  %{fpc_arches}
+# fpc broken in rawhide, see:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1517323
+%if 0%{?fedora} >= 28
+ExcludeArch:    armv7hl
+%endif
 
 BuildRequires:	fpc >= 2.6.4
 BuildRequires:	lazarus
@@ -108,6 +112,10 @@ fi
 
 
 %changelog
+* Sun Dec 31 2017 Richard Shaw <hobbes1069@gmail.com> - 2.2.0-1
+- Update to latest upstream release.
+- Disable armv7hl on rawhide/28 until fpc is fixed.
+
 * Fri Sep 22 2017 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-2
 - Fix mariadb requires for Fedora 28 and up.
   https://bugzilla.redhat.com/show_bug.cgi?id=1486480
diff --git a/sources b/sources
index a660b0a..01adcf2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cqrlog-2.1.0.tar.gz) = df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
+SHA512 (cqrlog-2.2.0.tar.gz) = 7c977b44a40da30e1c9e27c62ee5ba19c4cc9f537164f18f960a65ba7bcd546f4abb937f6057bd90ea81c50bea5ceff1fda77a2ef48cd98f1a67712257ac2431