diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 423fdb4d7b25..40e506ec104e 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
@@ -55,5 +55,10 @@ post-install:
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_sub.1
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_pub.1
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_passwd.1
+	# Adjust configuration files
+	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.example ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.sample
+	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.sample
 
 .include <bsd.port.mk>
diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo
index cd265b60fbf8..dc784e358e89 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mosquitto-1.3.1.tar.gz) = 1ee649cb80e0bd0aed8476349aa4c15c667507e2fc69540f18e3a1c599ed85fd
-SIZE (mosquitto-1.3.1.tar.gz) = 350381
+SHA256 (mosquitto-1.3.2.tar.gz) = 3ae47d812da6c5a4646d292624a0fc00a00f8930fb19c9c11f1c922e548ca713
+SIZE (mosquitto-1.3.2.tar.gz) = 352143
diff --git a/net/mosquitto/files/patch-CMakeList.txt b/net/mosquitto/files/patch-CMakeList.txt
index dc3bd23e697a..6b1c183ebf70 100644
--- a/net/mosquitto/files/patch-CMakeList.txt
+++ b/net/mosquitto/files/patch-CMakeList.txt
@@ -1,9 +1,10 @@
 --- CMakeLists.txt.orig	2014-05-16 15:15:44.000000000 -0700
 +++ CMakeLists.txt	2014-05-16 15:28:39.000000000 -0700
-@@ -8,6 +8,8 @@
+@@ -8,6 +8,9 @@
  
  set (VERSION 1.3.1)
  
++include_directories(/usr/local/include)
 +link_directories(/usr/local/lib)
 +
  if (WIN32)
diff --git a/net/mosquitto/pkg-plist b/net/mosquitto/pkg-plist
index 89c017234693..e73e40d6bf13 100644
--- a/net/mosquitto/pkg-plist
+++ b/net/mosquitto/pkg-plist
@@ -8,13 +8,13 @@ share/man/man1/mosquitto_pub.1.gz
 share/man/man1/mosquitto_passwd.1.gz
 %%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.pyc
 %%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.py
-%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto-1.3.1-py%%PYTHON_VER%%.egg-info
+%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto-1.3.2-py%%PYTHON_VER%%.egg-info
 lib/libmosquittopp.so.1
 lib/libmosquittopp.so
 lib/libmosquitto.so.1
 lib/libmosquitto.so
-lib/libmosquitto.so.1.3.1
-lib/libmosquittopp.so.1.3.1
+lib/libmosquitto.so.1.3.2
+lib/libmosquittopp.so.1.3.2
 include/mosquittopp.h
 include/mosquitto_plugin.h
 include/mosquitto.h
@@ -22,12 +22,10 @@ bin/mosquitto_sub
 bin/mosquitto_pub
 bin/mosquitto_passwd
 sbin/mosquitto
-etc/mosquitto/pwfile.example
-etc/mosquitto/pskfile.example
-@unexec if cmp -s %D/etc/mosquitto/mosquitto.conf %D/etc/mosquitto/mosquitto.conf.example; then rm -f %D/etc/mosquitto/mosquitto.conf; fi
-etc/mosquitto/mosquitto.conf.example
-@exec cp -n %B/mosquitto.conf.example %B/mosquitto.conf
-etc/mosquitto/aclfile.example
+@sample etc/mosquitto/pwfile.sample
+@sample etc/mosquitto/pskfile.sample
+@sample etc/mosquitto/mosquitto.conf.sample
+@sample etc/mosquitto/aclfile.sample
 @dirrmtry etc/mosquitto
 @dirrmtry share/man/man8
 @dirrmtry share/man/man7