--- Makefile	(revision 493543)
+++ Makefile	(working copy)
@@ -2,9 +2,9 @@ 
 # $FreeBSD$
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.4
+DISTVERSIONPREFIX=v
 CATEGORIES=	net comms ipv6
-MASTER_SITES=	SF
 
 MAINTAINER=	gregf@hugops.pw
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
@@ -11,8 +11,10 @@ 
 
 LICENSE=	GPLv3
 
+USES=		autoreconf gmake iconv pkgconfig ssl
 USE_XORG=	x11
-USES=		gmake iconv pkgconfig ssl
+USE_GITHUB=	yes
+
 CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} --disable-credssp
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
--- distinfo	(revision 493543)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@ 
-SHA256 (rdesktop-1.8.3.tar.gz) = 88b20156b34eff5f1b453f7c724e0a3ff9370a599e69c01dc2bf0b5e650eece4
-SIZE (rdesktop-1.8.3.tar.gz) = 320212
+TIMESTAMP = 1550673649
+SHA256 (rdesktop-rdesktop-v1.8.4_GH0.tar.gz) = 516f04df92f16eba04c96bbf9aeb05b9da686689c2bb5c107e0941583e09f933
+SIZE (rdesktop-rdesktop-v1.8.4_GH0.tar.gz) = 392460
--- files/patch-configure	(revision 493543)
+++ files/patch-configure	(nonexistent)
@@ -1,5 +0,0 @@ 
---- configure.orig	Wed Mar  2 09:35:03 2005
-+++ configure	Mon Mar  7 16:54:07 2005
-@@ -1983 +1983 @@
--    CFLAGS="-g -O2"
-+    #CFLAGS="-g -O2"
--- pkg-plist	(revision 493543)
+++ pkg-plist	(working copy)
@@ -2,12 +2,18 @@ 
 man/man1/rdesktop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/ctrl.txt
 %%PORTDOCS%%%%DOCSDIR%%/ipv6.txt
 %%PORTDOCS%%%%DOCSDIR%%/keymap-names.txt
 %%PORTDOCS%%%%DOCSDIR%%/keymapping.txt
 %%PORTDOCS%%%%DOCSDIR%%/licensing.txt
+%%PORTDOCS%%%%DOCSDIR%%/lspci-channel.txt
+%%PORTDOCS%%%%DOCSDIR%%/makerelease.txt
 %%PORTDOCS%%%%DOCSDIR%%/patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/rdpsnd-rec.txt
+%%PORTDOCS%%%%DOCSDIR%%/rdpsnd.txt
 %%PORTDOCS%%%%DOCSDIR%%/redirection.txt
+%%PORTDOCS%%%%DOCSDIR%%/seamlessrdp-channel.txt
 %%DATADIR%%/keymaps/ar
 %%DATADIR%%/keymaps/common
 %%DATADIR%%/keymaps/convert-map
@@ -18,6 +24,7 @@ 
 %%DATADIR%%/keymaps/en-dv
 %%DATADIR%%/keymaps/en-gb
 %%DATADIR%%/keymaps/en-us
+%%DATADIR%%/keymaps/en-us-intl
 %%DATADIR%%/keymaps/es
 %%DATADIR%%/keymaps/et
 %%DATADIR%%/keymaps/fi
@@ -24,6 +31,7 @@ 
 %%DATADIR%%/keymaps/fo
 %%DATADIR%%/keymaps/fr
 %%DATADIR%%/keymaps/fr-be
+%%DATADIR%%/keymaps/fr-bepo
 %%DATADIR%%/keymaps/fr-ca
 %%DATADIR%%/keymaps/fr-ch
 %%DATADIR%%/keymaps/hr