diff --git a/rdesktop.spec b/rdesktop.spec
index 7b94335..fea1702 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -1,26 +1,32 @@
-Name:           rdesktop
-Version:        1.8.3
-Release:        8%{?dist}
-Summary:        X client for remote desktop into Windows Terminal Server
-
-Group:          User Interface/Desktops
-License:        GPLv3+
-URL:            http://www.rdesktop.org/
-Source0:        http://downloads.sourceforge.net/rdesktop/%{name}-%{version}.tar.gz
-Patch1:         %{name}-libao.patch
-BuildRequires:  libao-devel
+#global commit 1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105
+#global gittag GIT-TAG
+#global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name:		rdesktop
+Version:	1.8.4
+Release:	1%{?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
+Patch1:		%{name}-libao.patch
+BuildRequires:	libao-devel
 %if 0%{?fedora} > 19
 %global credssp --disable-credssp
 %else
 %global credssp --enable-credssp
-BuildRequires:  libgssglue-devel
+BuildRequires:	libgssglue-devel
 %endif
-BuildRequires:  libX11-devel
-BuildRequires:  libXrandr-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pcsc-lite-devel
-BuildRequires:  autoconf automake libtool
+BuildRequires:	libX11-devel
+BuildRequires:	libXcursor-devel
+BuildRequires:	libXrandr-devel
+BuildRequires:	libsamplerate-devel
+BuildRequires:	openssl-devel
+BuildRequires:	pcsc-lite-devel
+BuildRequires:	autoconf automake libtool
 
 %description
 rdesktop is an open source client for Windows NT Terminal Server and
@@ -29,6 +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
 %patch1 -p1 -b .ao
 
@@ -43,12 +50,18 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 
 %files
-%doc COPYING README doc/{AUTHORS,ChangeLog,HACKING,TODO,*.txt}
+%doc COPYING README* doc/{AUTHORS,ChangeLog,HACKING,TODO,*.txt}
 %{_bindir}/rdesktop
 %{_datadir}/rdesktop/
 %{_mandir}/man1/*
 
 %changelog
+* Sat Jan 26 2019 Charles R. Anderson <cra@wpi.edu> - 1.8.4-1
+- Update to 1.8.4 release
+
+* Fri Nov 30 2018 Charles R. Anderson <cra@wpi.edu> - 1.8.4-0.1
+- Update to git master
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
@@ -213,7 +226,7 @@ Update to 1.6.0
 
 * Thu Jul 08 2004 Warren Togami <wtogami@redhat.com>
 - #127207 Finnish "fi" keymap fix
-          "fi" ISO_Level3_Shift warning fix
+	  "fi" ISO_Level3_Shift warning fix
 
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
@@ -234,7 +247,7 @@ Update to 1.6.0
 - BuildPrereq -> BuildRequires, the former is deprecated
 - Remove doc files that no longer exist
 - Add missing XFree86-devel
-- There was no -1 or -2.  Nothing to see here.  Move along.
+- There was no -1 or -2.  Nothing to see here.	Move along.
 
 * Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
 - rebuilt