diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile
index 7ae41835622..283ac9ba444 100644
--- a/editors/subtitleeditor/Makefile
+++ b/editors/subtitleeditor/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.53 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.54 2017/11/16 07:58:43 jasper Exp $
 
 COMMENT=		GTK+ subtitles editor
 
 V=			0.53.0
 DISTNAME=		subtitleeditor-${V}
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		graphics editors
 
@@ -15,7 +15,7 @@ HOMEPAGE=		http://home.gna.org/subtitleeditor/
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
+WANTLIB += Xtst X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atkmm-1.6
 WANTLIB += atspi c cairo cairo-gobject cairomm-1.0 dbus-1 enchant
 WANTLIB += epoxy expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile
index df3870cc67c..35be51a0d87 100644
--- a/editors/tpad/Makefile
+++ b/editors/tpad/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.15 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2017/11/16 07:58:43 jasper Exp $
 
 COMMENT =	simple, fast GTK-based text editor
 DISTNAME =	tpad-5.7.1.3
 CATEGORIES =	editors x11
-REVISION =	5
+REVISION =	6
 
 HOMEPAGE =	https://launchpad.net/tpad-project/
 
 # GPLv3+
 PERMIT_PACKAGE_CDROM =		Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xtst X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi c cairo
 WANTLIB += cairo-gobject dbus-1 enchant epoxy expat ffi fontconfig
 WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index baa1b28e484..0e0a39a6b53 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.19 2017/10/23 17:10:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2017/11/16 07:58:43 jasper Exp $
 
 COMMENT =	Playstation 1 emulator
 
 DISTNAME =	pcsxr-1.9.94.r87113p0
 PKGNAME =	pcsxr-1.9.94beta0
-REVISION =	5
+REVISION =	6
 CATEGORIES =	emulators games
 HOMEPAGE =	http://pcsxr.codeplex.com/
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += GL ICE SDL SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage
-WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xv Xxf86vm
+WANTLIB += GL SDL X11 X11-xcb Xcomposite Xcursor Xdamage
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst Xv Xxf86vm
 WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject cdio
 WANTLIB += dbus-1 drm epoxy expat ffi fontconfig freetype gdk-3
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0