diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index ca1f8f21358..ed18ac5ed6a 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2019/03/11 04:11:57 bket Exp $
+# $OpenBSD: Makefile,v 1.13 2019/03/15 14:53:43 bcallah Exp $
 
 COMMENT =	collaborative drawing program
-DISTNAME =	drawpile-2.0.11
+DISTNAME =	drawpile-2.1.2
 CATEGORIES =	graphics x11
-REVISION =	2
 
 HOMEPAGE =	https://drawpile.net/
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -13,12 +12,12 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += ${COMPILER_LIBCXX} KF5Archive KF5DNSSD Qt5Core Qt5Gui
 WANTLIB += Qt5Multimedia Qt5Network Qt5Sql Qt5Svg Qt5Widgets c
-WANTLIB += gif m microhttpd miniupnpc sodium
+WANTLIB += gif m microhttpd miniupnpc sodium vpx
 
 MASTER_SITES =	https://drawpile.net/files/src/
 
 # C++11
-COMPILER =	base-clang ports-gcc base-gcc
+COMPILER =	base-clang ports-gcc
 
 MODULES =	devel/cmake \
 		x11/qt5
@@ -26,6 +25,7 @@ MODULES =	devel/cmake \
 LIB_DEPENDS =	devel/kf5/karchive \
 		devel/kf5/kdnssd \
 		graphics/giflib \
+		multimedia/libvpx \
 		net/miniupnp/miniupnpc \
 		security/libsodium \
 		www/libmicrohttpd \
@@ -33,19 +33,11 @@ LIB_DEPENDS =	devel/kf5/karchive \
 		x11/qt5/qtsvg
 
 RUN_DEPENDS =	devel/desktop-file-utils \
+		misc/shared-mime-info \
 		x11/gtk+3,-guic
 
 CONFIGURE_ARGS =	-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
 
 NO_TEST =	Yes
 
-# Install .desktop and icon files (CMake does it wrong)
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/desktop/drawpile.desktop \
-		${PREFIX}/share/applications
-	${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/256x256/apps
-	${INSTALL_DATA} ${WRKSRC}/desktop/drawpile-256x256.png \
-		${PREFIX}/share/icons/hicolor/256x256/apps
-
 .include <bsd.port.mk>
diff --git a/graphics/drawpile/distinfo b/graphics/drawpile/distinfo
index 6febf1300c6..c18f9040c2b 100644
--- a/graphics/drawpile/distinfo
+++ b/graphics/drawpile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (drawpile-2.0.11.tar.gz) = 80qb40FNyibQWeKS6ZTqoFkyzKcKRlo5vpwCBntGAUA=
-SIZE (drawpile-2.0.11.tar.gz) = 2261916
+SHA256 (drawpile-2.1.2.tar.gz) = EdaUJ6vmCjw6fNusQlK6y+ob9xLYkSUwbrAnfsKwcwo=
+SIZE (drawpile-2.1.2.tar.gz) = 2404567
diff --git a/graphics/drawpile/patches/patch-desktop_CMakeLists_txt b/graphics/drawpile/patches/patch-desktop_CMakeLists_txt
deleted file mode 100644
index bf9c85d63ac..00000000000
--- a/graphics/drawpile/patches/patch-desktop_CMakeLists_txt
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: patch-desktop_CMakeLists_txt,v 1.1.1.1 2017/12/29 22:41:06 bcallah Exp $
-
-CMake does this wrong. We'll take care of it in post-install.
-
-Index: desktop/CMakeLists.txt
---- desktop/CMakeLists.txt.orig
-+++ desktop/CMakeLists.txt
-@@ -1,8 +1,8 @@
--find_program(XDGICON xdg-icon-resource)
--find_program(XDGMENU xdg-desktop-menu)
--find_program(XDGMIME xdg-mime)
-+#find_program(XDGICON xdg-icon-resource)
-+#find_program(XDGMENU xdg-desktop-menu)
-+#find_program(XDGMIME xdg-mime)
- 
--if( XDGICON )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGICON} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/drawpile-16x16.png --size 16 drawpile)
- 		execute_process(COMMAND ${XDGICON} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/drawpile-32x32.png --size 32 drawpile)
-@@ -18,13 +18,13 @@ if( XDGICON )
- 	")
- endif()
- 
--if( XDGMENU )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGMENU} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/drawpile.desktop)
- 	")
- endif()
- 
--if( XDGMIME )
-+if( FALSE )
- 	install(CODE "
- 		execute_process(COMMAND ${XDGMIME} install ${CMAKE_CURRENT_SOURCE_DIR}/x-drawpile.xml)
- 	")
diff --git a/graphics/drawpile/pkg/PLIST b/graphics/drawpile/pkg/PLIST
index a62209e63c4..d998792d04d 100644
--- a/graphics/drawpile/pkg/PLIST
+++ b/graphics/drawpile/pkg/PLIST
@@ -1,11 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.9 2018/08/15 23:44:34 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.10 2019/03/15 14:53:43 bcallah Exp $
 bin/drawpile
-@bin bin/drawpile-2.0.11
+@bin bin/drawpile-2.1.2
 @bin bin/drawpile-srv
 @man man/man1/drawpile-srv.1
-share/appdata/
-share/appdata/drawpile.appdata.xml
-share/applications/drawpile.desktop
+share/applications/net.drawpile.drawpile.desktop
 share/doc/drawpile/
 share/doc/drawpile/COPYING
 share/doc/drawpile/ChangeLog
@@ -23,6 +21,7 @@ share/drawpile/drawpile/i18n/drawpile_de.qm
 share/drawpile/drawpile/i18n/drawpile_fi.qm
 share/drawpile/drawpile/i18n/drawpile_ja.qm
 share/drawpile/drawpile/i18n/drawpile_ru.qm
+share/drawpile/drawpile/i18n/drawpile_vi.qm
 share/drawpile/drawpile/i18n/drawpile_zh.qm
 share/drawpile/drawpile/palettes/
 share/drawpile/drawpile/palettes/Breeze.gpl
@@ -103,11 +102,15 @@ share/drawpile/drawpile/theme/dark/object-flip-vertical.svg
 share/drawpile/drawpile/theme/dark/object-locked.svg
 share/drawpile/drawpile/theme/dark/object-rotate-left.svg
 share/drawpile/drawpile/theme/dark/object-rotate-right.svg
+share/drawpile/drawpile/theme/dark/security-high.svg
+share/drawpile/drawpile/theme/dark/security-medium.svg
 share/drawpile/drawpile/theme/dark/select-rectangular.svg
 share/drawpile/drawpile/theme/dark/transform-rotate.svg
+share/drawpile/drawpile/theme/dark/window-pin.svg
 share/drawpile/drawpile/theme/dark/zoom-in.svg
 share/drawpile/drawpile/theme/dark/zoom-original.svg
 share/drawpile/drawpile/theme/dark/zoom-out.svg
+share/drawpile/drawpile/theme/dark/zoom-select.svg
 share/drawpile/drawpile/theme/icons.txt
 share/drawpile/drawpile/theme/light/
 share/drawpile/drawpile/theme/light/application-exit.svg
@@ -172,11 +175,32 @@ share/drawpile/drawpile/theme/light/object-flip-vertical.svg
 share/drawpile/drawpile/theme/light/object-locked.svg
 share/drawpile/drawpile/theme/light/object-rotate-left.svg
 share/drawpile/drawpile/theme/light/object-rotate-right.svg
+share/drawpile/drawpile/theme/light/security-high.svg
+share/drawpile/drawpile/theme/light/security-medium.svg
 share/drawpile/drawpile/theme/light/select-rectangular.svg
 share/drawpile/drawpile/theme/light/transform-rotate.svg
+share/drawpile/drawpile/theme/light/window-pin.svg
 share/drawpile/drawpile/theme/light/zoom-in.svg
 share/drawpile/drawpile/theme/light/zoom-original.svg
 share/drawpile/drawpile/theme/light/zoom-out.svg
-share/icons/hicolor/256x256/apps/drawpile-256x256.png
+share/drawpile/drawpile/theme/light/zoom-select.svg
+share/icons/hicolor/128x128/apps/drawpile.png
+share/icons/hicolor/128x128/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/16x16/apps/drawpile.png
+share/icons/hicolor/16x16/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/256x256/apps/drawpile.png
+share/icons/hicolor/256x256/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/32x32/apps/drawpile.png
+share/icons/hicolor/32x32/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/48x48/apps/drawpile.png
+share/icons/hicolor/48x48/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/64x64/apps/drawpile.png
+share/icons/hicolor/64x64/mimetypes/application-x-drawpile-recording.png
+share/icons/hicolor/scalable/apps/drawpile.svgz
+share/icons/hicolor/scalable/mimetypes/application-x-drawpile-recording.svgz
+share/metainfo/
+share/metainfo/net.drawpile.drawpile.appdata.xml
+share/mime/packages/x-drawpile.xml
+@tag update-mime-database
 @tag gtk-update-icon-cache %D/share/icons/hicolor
 @tag update-desktop-database