diff --git a/rdesktop.spec b/rdesktop.spec
index fea1702..030c1d5 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -1,17 +1,17 @@
-#global commit 1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105
-#global gittag GIT-TAG
-#global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit 1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105
+%global gittag v1.8.4
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		rdesktop
 Version:	1.8.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	X client for remote desktop into Windows Terminal Server
 
 Group:		User Interface/Desktops
 License:	GPLv3+
 URL:		http://www.rdesktop.org/
-#Source0:	https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
-Source0:	https://github.com/rdesktop/rdesktop/releases/download/v1.8.4/rdesktop-1.8.4.tar.gz
+#Source0:	https://github.com/%%{name}/%%{name}/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz
+Source0:	https://github.com/%{name}/%{name}/releases/download/v%{version}/rdesktop-%{version}.tar.gz
 Patch1:		%{name}-libao.patch
 BuildRequires:	libao-devel
 %if 0%{?fedora} > 19
@@ -35,7 +35,7 @@ Remote Desktop Protocol (RDP) in order to present the user's NT
 desktop. Unlike Citrix ICA, no server extensions are required.
 
 %prep
-#setup -q -n %{name}-%{commit}
+#setup -q -n %%{name}-%%{commit}
 %setup -q
 %patch1 -p1 -b .ao
 
@@ -56,6 +56,14 @@ make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 29 2019 Charles R. Anderson <cra@wpi.edu> - 1.8.4-2
+- Escape macros in comments
+- 1.8.4 release security fixes rhbz#1670427:
+  CVE-2018-8794 CVE-2018-8795 CVE-2018-8797 CVE-2018-20175 CVE-2018-20176
+  CVE-2018-8791 CVE-2018-8792 CVE-2018-8793 CVE-2018-8796 CVE-2018-8798
+  CVE-2018-8799 CVE-2018-8800 CVE-2018-20174 CVE-2018-20177 CVE-2018-20178
+  CVE-2018-20179 CVE-2018-20180 CVE-2018-20181 CVE-2018-20182
+
 * Sat Jan 26 2019 Charles R. Anderson <cra@wpi.edu> - 1.8.4-1
 - Update to 1.8.4 release