diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 45789e4162b1..234da85e8010 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,48 +1,48 @@
 # Created by: Joseph Benden <joe@thrallingpenguin.com>
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.4
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Open-Source MQTT Broker
 
 LICENSE=	EPL
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
 		libuuid.so:misc/e2fsprogs-libuuid
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		cmake ssl
-NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USERS=		nobody
 
-OPTIONS_DEFINE=	WS
+NOCONFIGURE=	yes
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-CMAKE_ARGS+=	-DCMAKE_LIBDATADIR="${PREFIX}/libdata"
+OPTIONS_DEFINE=	WS
 
 WS_DESC=	MQTT over Websockets support
 WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 WS_CMAKE_ON=	-DWITH_WEBSOCKETS=ON
 
+CMAKE_ARGS+=	-DCMAKE_LIBDATADIR="${PREFIX}/libdata"
+
 post-patch:
 # do not run ldconfig in stage dir
 	@${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt
 
 post-install:
 # Adjust configuration files
 	${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample
 	${MV} ${STAGEDIR}${ETCDIR}/pskfile.example ${STAGEDIR}${ETCDIR}/pskfile.sample
 	${MV} ${STAGEDIR}${ETCDIR}/aclfile.example ${STAGEDIR}${ETCDIR}/aclfile.sample
 
 .include <bsd.port.mk>
diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo
index 084f51fb3087..66fafa75c371 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538306679
-SHA256 (mosquitto-1.5.3.tar.gz) = 3081a998d303a883b1cd064009beabc88aa9159e26f5258a4ae6007160491d10
-SIZE (mosquitto-1.5.3.tar.gz) = 425844
+TIMESTAMP = 1542087175
+SHA256 (mosquitto-1.5.4.tar.gz) = 5fd7f3454fd6d286645d032bc07f44a1c8583cec02ef2422c9eb32e0a89a9b2f
+SIZE (mosquitto-1.5.4.tar.gz) = 430602
diff --git a/net/mosquitto/files/patch-lib_socks__mosq.c b/net/mosquitto/files/patch-lib_socks__mosq.c
deleted file mode 100644
index f0ea2bf1d2ef..000000000000
--- a/net/mosquitto/files/patch-lib_socks__mosq.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/socks_mosq.c.orig	2018-09-30 11:40:37 UTC
-+++ lib/socks_mosq.c
-@@ -24,6 +24,10 @@ Contributors:
- #else
- #  include <arpa/inet.h>
- #endif
-+#ifdef __FreeBSD__
-+#  include <sys/socket.h>
-+#  include <netinet/in.h>
-+#endif
- 
- #include "mosquitto_internal.h"
- #include "memory_mosq.h"
diff --git a/net/mosquitto/files/patch-src_CMakeLists.txt b/net/mosquitto/files/patch-src_CMakeLists.txt
index 8113be78b1fa..90bb0e36d2e1 100644
--- a/net/mosquitto/files/patch-src_CMakeLists.txt
+++ b/net/mosquitto/files/patch-src_CMakeLists.txt
@@ -1,27 +1,27 @@
 --- src/CMakeLists.txt.orig	2018-09-25 15:27:43 UTC
 +++ src/CMakeLists.txt
-@@ -114,6 +114,7 @@ if (WIN32 OR CYGWIN)
+@@ -114,6 +114,7 @@
  endif (WIN32 OR CYGWIN)
  
  add_definitions (-DWITH_BROKER)
 +add_definitions (-DWITH_THREADING)
  
  set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
  
-@@ -131,7 +132,7 @@ if (UNIX)
- 	if (APPLE)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
- 	else (APPLE)
--		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} m)
- 		find_library(LIBRT rt)
- 		if (LIBRT)
- 			set (MOSQ_LIBS ${MOSQ_LIBS} rt)
-@@ -185,7 +186,6 @@ if (${WITH_TLS} STREQUAL ON)
+@@ -132,7 +133,7 @@
+     elseif(QNX)
+         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
+     else(APPLE)
+-        set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
++        set (MOSQ_LIBS ${MOSQ_LIBS} m)
+         find_library(LIBRT rt)
+         if (LIBRT)
+             set (MOSQ_LIBS ${MOSQ_LIBS} rt)
+@@ -186,7 +187,6 @@
  endif (${WITH_TLS} STREQUAL ON)
  
  if (UNIX AND NOT APPLE)
 -	install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
  endif (UNIX AND NOT APPLE)