diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index a78e144b0874..a476e7c0fdbd 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.9
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
@@ -15,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LIB_DEPENDS=	libcares.so:dns/c-ares
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
-USES=		cmake python:2
+USES=		cmake ssl
 NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
@@ -23,6 +22,12 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USERS=		nobody
 
+OPTIONS_DEFINE=	WS
+
+WS_DESC=	MQTT over Websockets support
+WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+WS_CMAKE_ON=	-DWITH_WEBSOCKETS=ON
+
 post-patch:
 # do not run ldconfig in stage dir
 	${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo
index 6ea89b56d864..e5826266672b 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mosquitto-1.4.4.tar.gz) = c643c7123708aadcd29287dda7b5ce7c910f75b02956a8fc4fe65ad2ea767a5f
-SIZE (mosquitto-1.4.4.tar.gz) = 325077
+TIMESTAMP = 1468823152
+SHA256 (mosquitto-1.4.9.tar.gz) = 1df3ae07de40b80a74cd37a7b026895c544cdd3b42c9e0719ae91623aa98c58b
+SIZE (mosquitto-1.4.9.tar.gz) = 325712
diff --git a/net/mosquitto/files/patch-CMakeLists.txt b/net/mosquitto/files/patch-CMakeLists.txt
index 798cbed7df8b..95adb3358232 100644
--- a/net/mosquitto/files/patch-CMakeLists.txt
+++ b/net/mosquitto/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- CMakeLists.txt.orig	2015-05-07 13:21:22 UTC
+--- CMakeLists.txt.orig	2016-06-02 21:20:22 UTC
 +++ CMakeLists.txt
 @@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8)
  
- set (VERSION 1.4.2)
+ set (VERSION 1.4.9)
  
 +include_directories(/usr/local/include)
 +link_directories(/usr/local/lib)
@@ -14,8 +14,8 @@
  	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
  	set (INCLUDEDIR include)
  	set (DATAROOTDIR share)
--	set (MANDIR ${DATAROOTDIR}/man)
-+	set (MANDIR man)
- 	set (SHAREDIR ${DATAROOTDIR}/mosquitto)
+-	set (MANDIR "${DATAROOTDIR}/man")
++	set (MANDIR "man")
+ 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
  endif (WIN32)