diff --git a/devel/redasm/Makefile b/devel/redasm/Makefile
index a6b7c0b4ba9b..2deaed3a504b 100644
--- a/devel/redasm/Makefile
+++ b/devel/redasm/Makefile
@@ -1,34 +1,37 @@
 PORTNAME=	redasm
 PORTVERSION=	2.1.1
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Interactive, multiarchitecture disassembler
 WWW=		https://redasm.io/
 
 LICENSE=	GPLv3
 
 USES=		cmake compiler:c++11-lang qt:5
 USE_QT=		buildtools:build qmake:build core gui widgets
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	REDasmOrg
 GH_PROJECT=	REDasm
 GH_TUPLE=	REDasmOrg:REDasm-Library:b59bdc3:libra/LibREDasm \
 		Dax89:QHexView:4524ca3:qhv/QHexView \
 		aquynh:capstone:4948fd1:cs/LibREDasm/depends/capstone
 
 PLIST_FILES=	bin/REDasm lib/LibREDasm.so bin/redasm
 
 post-patch:
 	@${REINPLACE_CMD} -e '/Git/s,find_package,#&, ; \
 		s|unknown|8848416|' ${WRKSRC}/CMakeLists.txt
+# Ampersands are rendered as is for window titles, whack them
+	@${REINPLACE_CMD} -e '/property name="windowTitle"/,+1 \
+		s,&,,' ${WRKSRC}/mainwindow.ui
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/REDasm ${STAGEDIR}${PREFIX}/bin
 	${LN} -s REDasm ${STAGEDIR}${PREFIX}/bin/redasm
 	${INSTALL_LIB} ${BUILD_WRKSRC}/LibREDasm.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h b/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h
new file mode 100644
index 000000000000..d500795ba857
--- /dev/null
+++ b/devel/redasm/files/patch-LibREDasm_redasm_plugins_emulator.h
@@ -0,0 +1,14 @@
+--- LibREDasm/redasm/plugins/emulator.h.orig	2019-05-23 14:58:04 UTC
++++ LibREDasm/redasm/plugins/emulator.h
+@@ -28,11 +28,7 @@ class Emulator
+         MemoryBuffer* getSegmentMemory(address_t address, offset_t* offset);
+         BufferView getMemory(address_t address);
+         BufferView getStack(offset_t sp);
+-
+-    private:
+         void remap();
+-
+-    protected:
+         InstructionPtr m_currentinstruction;
+         DisassemblerAPI* m_disassembler;
+         DispatcherType m_dispatcher;