diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index 961821302829..2af99f743c8a 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -2,7 +2,14 @@
 
 PORTNAME=	Drawpile
 DISTVERSION=	2.1.17
+PORTREVISION=	1
 CATEGORIES=	graphics python
+MASTER_SITES=	https://drawpile.net/files/src/
+DISTNAME=	drawpile-${DISTVERSION}
+
+PATCH_SITES=	https://github.com/drawpile/${PORTNAME}/commit/
+PATCHFILES=	b46115160c5587aae9306e57d4223906e74ed512.patch:-p1 \
+		ed1a75deb113da2d1df91a28f557509c4897130e.patch:-p1
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collaborative drawing program
@@ -17,8 +24,6 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libvpx.so:multimedia/libvpx
 
 USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qt:5 shared-mime-info
-USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:tl}
 USE_QT=		core gui multimedia network sql svg widgets buildtools_build linguisttools_build qmake_build
 USE_KDE=	archive dnssd
 
diff --git a/graphics/drawpile/distinfo b/graphics/drawpile/distinfo
index 213f1456b393..62939fade02f 100644
--- a/graphics/drawpile/distinfo
+++ b/graphics/drawpile/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1581960642
-SHA256 (drawpile-Drawpile-2.1.17_GH0.tar.gz) = 67e569856ca5031dadd349f17e5185e93d42020f560016540fc32b5b52653a2f
-SIZE (drawpile-Drawpile-2.1.17_GH0.tar.gz) = 2521569
+TIMESTAMP = 1601753384
+SHA256 (drawpile-2.1.17.tar.gz) = ee7f7ba81e6f1a9c3c32275f84364d10713c24ec040da8cb4b13c3ea6bb09086
+SIZE (drawpile-2.1.17.tar.gz) = 2521585
+SHA256 (b46115160c5587aae9306e57d4223906e74ed512.patch) = 7fdd509c62f2d0754aa0b89821d77384a4f49a3f74ef606dccd2b3cd5c01a593
+SIZE (b46115160c5587aae9306e57d4223906e74ed512.patch) = 1119
+SHA256 (ed1a75deb113da2d1df91a28f557509c4897130e.patch) = 3748bcd763757ba098087af1bfc9715daabe4246486146d208b509e2a9b6292d
+SIZE (ed1a75deb113da2d1df91a28f557509c4897130e.patch) = 3770
diff --git a/graphics/drawpile/files/patch-src_desktop_bundled_QtColorWidgets_color__wheel.cpp b/graphics/drawpile/files/patch-src_desktop_bundled_QtColorWidgets_color__wheel.cpp
deleted file mode 100644
index 862e4e792e0b..000000000000
--- a/graphics/drawpile/files/patch-src_desktop_bundled_QtColorWidgets_color__wheel.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/desktop/bundled/QtColorWidgets/color_wheel.cpp.orig	2020-05-29 16:35:46 UTC
-+++ src/desktop/bundled/QtColorWidgets/color_wheel.cpp
-@@ -25,6 +25,7 @@
- #include <QtMath>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLineF>
- #include <QDragEnterEvent>
- #include <QMimeData>
diff --git a/graphics/drawpile/files/patch-src_desktop_widgets_popupmessage.h b/graphics/drawpile/files/patch-src_desktop_widgets_popupmessage.h
deleted file mode 100644
index 923fa0d1e4f8..000000000000
--- a/graphics/drawpile/files/patch-src_desktop_widgets_popupmessage.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/desktop/widgets/popupmessage.h.orig	2020-05-29 16:32:32 UTC
-+++ src/desktop/widgets/popupmessage.h
-@@ -20,6 +20,7 @@
- #define POPUPMESSAGE_H
- 
- #include <QWidget>
-+#include <QPainterPath>
- 
- class QTextDocument;
- class QTimer;