diff --git a/emulators/pcem/Makefile b/emulators/pcem/Makefile
index c0eced8c0bc8..ef9e8b33fbc9 100644
--- a/emulators/pcem/Makefile
+++ b/emulators/pcem/Makefile
@@ -11,16 +11,16 @@ MAINTAINER=	darkfm@vera.com.uy
 COMMENT=	PC/PC-Compatible low-level emulator striving for accuracy
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf compiler gl gmake openal pkgconfig sdl zip
+USES=		autoreconf compiler gl gmake localbase:ldflags openal pkgconfig sdl zip
 USE_GL=		gl
 USE_SDL=	sdl2
 USE_WX=		3.0
 
 WRKSRC=		${WRKDIR}/pcem_emulator-pcem-faf5d6423060/
-PATCHDIR=files
 PLIST_FILES=	bin/pcem
-CONFIGURE_ARGS=	--enable-release-build --with-wx-config=wxgtk3u-3.0-config
+CONFIGURE_ARGS=	--enable-release-build --with-wx-config="${WX_CONFIG}"
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	amd64
 
diff --git a/emulators/pcem/files/patch-configure.ac b/emulators/pcem/files/patch-configure.ac
index f1eacfb448b7..045b25c0a423 100644
--- a/emulators/pcem/files/patch-configure.ac
+++ b/emulators/pcem/files/patch-configure.ac
@@ -1,32 +1,11 @@
 --- configure.ac.orig	2019-04-17 19:37:48 UTC
 +++ configure.ac
-@@ -64,6 +64,10 @@ case "${host_cpu}" in
+@@ -60,7 +60,7 @@ case "${host_cpu}" in
+     CPU=i386
+     AC_MSG_RESULT(${host_cpu})
+     ;;
+-    x86_64)
++    x86_64|amd64)
      CPU=x86_64
      AC_MSG_RESULT(${host_cpu})
      ;;
-+    amd64)
-+    CPU=x86_64
-+    AC_MSG_RESULT(${host_cpu})
-+    ;;
-     *)
-     AC_MSG_ERROR([Unsupported CPU.])
-     ;;
-@@ -149,6 +153,18 @@ case "$host" in
-            [echo "You need to install the OpenAL library."
-            exit -1])
-        build_linux="yes"
-+       ;;
-+    *-*-freebsd*)
-+       CFLAGS="$CFLAGS -I/usr/local/include"
-+       CXXFLAGS="$CXXFLAGS -I/usr/local/include"
-+       LDFLAGS="$LDFLAGS -L/usr/local/lib"
-+       AC_CHECK_LIB([GL], [glGetError], [], \
-+           [echo "You need to install the OpenGL library."
-+           exit -1])
-+       AC_CHECK_LIB([openal], [alGetError], [], \
-+           [echo "You need to install the OpenAL library."
-+           exit -1])
-+       build_other="yes"
-        ;;
-     *)
-        AC_CHECK_LIB([GL], [glGetError], [], \