--- net/freerdp/Makefile	
+++ net/freerdp/Makefile	
@@ -2,14 +2,12 @@ 
 # $FreeBSD: head/net/freerdp/Makefile 538329 2020-06-09 17:09:40Z kevans $
 
 PORTNAME=	freerdp
-DISTVERSION=	2.1.1
+DISTVERSION=	2.2.0
 PORTREVISION=	0
 CATEGORIES=	net comms
+MASTER_SITES=   https://pub.freerdp.com/releases/ \
+		https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-# FreeBSD doesn't have O_TMPFILE, must use shm_open w/ SHM_ANON instead.
-PATCHFILES=	1b5e234135b0.patch:-p1
-
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 
@@ -34,10 +32,6 @@ 
 
 PLIST_SUB+=	PATCHVERSION="${PATCHVERSION}"
 PLIST_SUB+=	MAJORVERSION="${MAJORVERSION}"
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	FreeRDP
-GH_PROJECT=	${GH_ACCOUNT}
 
 CMAKE_ARGS+=	-DWITH_CHANNELS:BOOL=ON \
 		-DWITH_DIRECTFB:BOOL=OFF \
--- net/freerdp/distinfo	
+++ net/freerdp/distinfo	
@@ -1,5 +1,3 @@ 
-TIMESTAMP = 1591628011
-SHA256 (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = ce363a6578530cf508df802bb980a8dd49a874919bfa33b8c61d992ad0882bfb
-SIZE (FreeRDP-FreeRDP-2.1.1_GH0.tar.gz) = 6828178
-SHA256 (1b5e234135b0.patch) = a7991aa963405ffabd5bd7eebf61f36dd1b7a9aa767ca0f52b230c8008e90701
-SIZE (1b5e234135b0.patch) = 1304
+TIMESTAMP = 1595498870
+SHA256 (freerdp-2.2.0.tar.gz) = 19b30759e324ce7a9767af880116a4c571761e9ad9c5d6c98c5b302ff8c24c6c
+SIZE (freerdp-2.2.0.tar.gz) = 6878427
--- net/freerdp/pkg-plist	
+++ net/freerdp/pkg-plist	
@@ -95,6 +95,7 @@ 
 include/freerdp2/freerdp/gdi/shape.h
 include/freerdp2/freerdp/gdi/video.h
 include/freerdp2/freerdp/graphics.h
+include/freerdp2/freerdp/heartbeat.h
 include/freerdp2/freerdp/input.h
 include/freerdp2/freerdp/license.h
 include/freerdp2/freerdp/listener.h