diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index b9e7c452b2b9..65f366373e9e 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -95,6 +95,7 @@ post-install:
 		--vardir=/var/lib/puppet \
 		--logdir=/var/log/puppet \
 		> ${ETCDIR}/puppet.conf-dist
+	${MKDIR} -p ${ETCDIR}/modules
 	@${ECHO} ${RUBY_SITELIBDIR}/puppet.rb | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${ECHO} ${RUBY_SITELIBDIR}/semver.rb | \
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index fa8545bcfeea..ff9a1665df8e 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -5,9 +5,11 @@ bin/puppet
 %%RUBY_SITELIBDIR%%/hiera_puppet.rb
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
+@dirrmtry etc/puppet/modules
 @dirrmtry etc/puppet
 @unexec rmdir /var/puppet 2>/dev/null || true
 @exec /bin/mkdir -p /var/puppet
+@exec /bin/mkdir -p etc/puppet/modules
 @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
 @dirrm %%RUBY_SITELIBDIR%%/hiera/backend
 @dirrm %%RUBY_SITELIBDIR%%/hiera