diff --git a/devel/heimdall/Makefile b/devel/heimdall/Makefile
index bce65f5ad2e0..6a4233aa1a13 100644
--- a/devel/heimdall/Makefile
+++ b/devel/heimdall/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	heimdall
 PORTVERSION=	1.4.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool suite used to flash firmware onto Samsung mobile devices
 WWW=		https://glassechidna.com.au/heimdall/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++11-lang cmake:insource
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	DOCS GUI
 OPTIONS_DEFAULT=GUI
 OPTIONS_SUB=	yes
 
 GUI_USES=	qt:5
 GUI_USE=	QT=buildtools:build,core,gui,qmake:build,widgets
 GUI_CMAKE_OFF=	-DDISABLE_FRONTEND=YES
 
 GH_ACCOUNT=	Benjamin-Dobell
 GH_PROJECT=	Heimdall
 
 PORTDOCS=	README
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/heimdall ${STAGEDIR}${PREFIX}/bin
 
 do-install-GUI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/heimdall-frontend ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Linux/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/heimdall/files/patch-heimdall_source_BridgeManager.h b/devel/heimdall/files/patch-heimdall_source_BridgeManager.h
new file mode 100644
index 000000000000..b2b82832cd79
--- /dev/null
+++ b/devel/heimdall/files/patch-heimdall_source_BridgeManager.h
@@ -0,0 +1,11 @@
+--- heimdall/source/BridgeManager.h.orig	2017-05-11 18:34:25 UTC
++++ heimdall/source/BridgeManager.h
+@@ -82,7 +82,7 @@ namespace Heimdall
+ 			{
+ 				kDefaultTimeoutSend = 3000,
+ 				kDefaultTimeoutReceive = 3000,
+-				kDefaultTimeoutEmptyTransfer = 100
++				kDefaultTimeoutEmptyTransfer = 3000
+ 			};
+ 
+ 			enum class UsbLogLevel