diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 686ded7f119..54e6216139e 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.44 2018/11/22 21:01:10 fcambus Exp $
+# $OpenBSD: Makefile,v 1.45 2018/12/21 11:12:11 fcambus Exp $
 
 COMMENT =	emulates the Super Nintendo Entertainment System
 BROKEN-alpha =	ICE/failure on filter/hq2x.cpp
 BROKEN-hppa =	ICE/failure on filter/hq2x.cpp
 BROKEN-powerpc =ICE/failure on filter/hq2x.cpp
 
-V =		1.57
+V =		1.58
 DISTNAME =	snes9x-$V
 EXTRACT_SUFX =	.tar.bz2
 
@@ -19,10 +19,10 @@ MAINTAINER =	Frederic Cambus <fcambus@openbsd.org>
 PERMIT_PACKAGE_CDROM =	non-commercial
 PERMIT_PACKAGE_FTP =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL SDL2 X11 Xext Xrandr Xv atk-1.0
+WANTLIB += ${COMPILER_LIBCXX} SDL2 X11 Xext Xrandr Xv atk-1.0
 WANTLIB += c cairo cairo-gobject epoxy gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 gtk-3 intl m pango-1.0
-WANTLIB += pangocairo-1.0 png xml2 z
+WANTLIB += pangocairo-1.0 png z
 
 MASTER_SITES =	https://github.com/snes9xgit/snes9x/releases/download/$V/
 
@@ -31,7 +31,6 @@ RUN_DEPENDS =	devel/desktop-file-utils \
 
 LIB_DEPENDS =	devel/sdl2 \
 		graphics/png \
-		textproc/libxml \
 		x11/gtk+3
 
 BUILD_DEPENDS =	${MODGNU_AUTOCONF_DEPENDS} \
@@ -71,10 +70,10 @@ pre-configure:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
-	cd ${WRKDIST}/docs && ${INSTALL_DATA} \
-	    control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
-	    ${PREFIX}/share/doc/snes9x
-	cd ${WRKDIST}/docs && ${INSTALL_DATA} snes9x.conf.default \
+	${INSTALL_DATA} ${WRKDIST}/LICENSE ${PREFIX}/share/doc/snes9x 
+	cd ${WRKDIST}/docs && ${INSTALL_DATA} control-inputs.txt controls.txt \
+	    snapshots.txt ${PREFIX}/share/doc/snes9x
+	cd ${WRKDIST}/unix && ${INSTALL_DATA} snes9x.conf.default \
 	    ${PREFIX}/share/examples/snes9x
 
 .include <bsd.port.mk>
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 0eec5b06c67..49327bfe281 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,2 +1,2 @@
-SHA256 (snes9x-1.57.tar.bz2) = c7wHrInkJNHF1OaWIfItjKZFvygi1GhXVJ7DwzE2Y/A=
-SIZE (snes9x-1.57.tar.bz2) = 2634463
+SHA256 (snes9x-1.58.tar.bz2) = +CULTopdOrmf3XCVhLgHmXXgJGVc1kbkI1GGRJ2dp0g=
+SIZE (snes9x-1.58.tar.bz2) = 2606076
diff --git a/emulators/snes9x/patches/patch-gtk_configure_ac b/emulators/snes9x/patches/patch-gtk_configure_ac
index e2f05013b9a..5235d73d476 100644
--- a/emulators/snes9x/patches/patch-gtk_configure_ac
+++ b/emulators/snes9x/patches/patch-gtk_configure_ac
@@ -1,14 +1,14 @@
-$OpenBSD: patch-gtk_configure_ac,v 1.2 2018/11/22 21:01:10 fcambus Exp $
+$OpenBSD: patch-gtk_configure_ac,v 1.3 2018/12/21 11:12:11 fcambus Exp $
 
 Index: gtk/configure.ac
 --- gtk/configure.ac.orig
 +++ gtk/configure.ac
-@@ -177,7 +177,7 @@ else
+@@ -147,7 +147,7 @@ else
    CFLAGS="$CFLAGS -fomit-frame-pointer"
  fi
  
 -LIBS="$LIBS -lX11 -ldl -lXext"
 +LIBS="$LIBS -lX11 -lXext"
+ OPENGL=no
  
- ZSNESFX='#ZSNESFX=yes'
- ZSNESC4='#ZSNESC4=yes'
+ if test yes = "$with_opengl" ; then
diff --git a/emulators/snes9x/pkg/PLIST b/emulators/snes9x/pkg/PLIST
index b86d617c5d0..d6f48f9fd90 100644
--- a/emulators/snes9x/pkg/PLIST
+++ b/emulators/snes9x/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.10 2018/06/29 22:16:12 espie Exp $
+@comment $OpenBSD: PLIST,v 1.11 2018/12/21 11:12:11 fcambus Exp $
 @bin bin/snes9x-gtk
 share/applications/snes9x.desktop
 share/doc/snes9x/
+share/doc/snes9x/LICENSE
 share/doc/snes9x/control-inputs.txt
 share/doc/snes9x/controls.txt
 share/doc/snes9x/snapshots.txt
-share/doc/snes9x/snes9x-license.txt
 share/examples/snes9x/
 share/examples/snes9x/snes9x.conf.default
 share/icons/hicolor/128x128/apps/snes9x.png