diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index e66490740f89..4ab3e89bf9de 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
@@ -90,7 +90,7 @@ post-install:
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	@${MKDIR} ${STAGEDIR}${WWWDIR}/public
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index 3f7c83f3ddd2..c79e26b50b74 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.6.1.tar.gz) = f3f8ba0243398f4a79a5f62e780a90b12dd0d770266256b446385952a1f0002f
-SIZE (puppet-3.6.1.tar.gz) = 2248333
+SHA256 (puppet-3.6.2.tar.gz) = 9114c63108c58e39db84937cb8f7e1add3dcbaa08fd730f631de6a7f64a3c360
+SIZE (puppet-3.6.2.tar.gz) = 2252186
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index 47e88aa24af1..83ec0a184a02 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -47,9 +47,9 @@ man/man8/puppet.8.gz
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
 www/puppet/config.ru
+@exec /bin/mkdir -p /var/puppet
 @exec /usr/sbin/chown -Rh puppet:puppet %D/%F
 @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
-@dirrm www/puppet/public
 @dirrm www/puppet
 @dirrmtry etc/puppet/modules
 @dirrmtry etc/puppet