diff --git a/srcpkgs/puppet/files/puppet/run b/srcpkgs/puppet/files/puppet/run
new file mode 100644
index 00000000000..2bb3bfa1cfc
--- /dev/null
+++ b/srcpkgs/puppet/files/puppet/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec puppet agent --no-daemonize
diff --git a/srcpkgs/puppet/files/puppetmaster/run b/srcpkgs/puppet/files/puppetmaster/run
new file mode 100644
index 00000000000..1df2f44af9a
--- /dev/null
+++ b/srcpkgs/puppet/files/puppetmaster/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+mkdir -p /run/puppet /var/lib/puppet
+chown -R puppet:puppet /var/lib/puppet
+exec puppet master --no-daemonize
diff --git a/srcpkgs/puppet/template b/srcpkgs/puppet/template
new file mode 100644
index 00000000000..6d4296161f6
--- /dev/null
+++ b/srcpkgs/puppet/template
@@ -0,0 +1,39 @@
+# Template file for 'pupper'
+pkgname=puppet
+version=3.7.3
+revision=1
+noarch=yes
+build_style=ruby-module
+hostmakedepends="ruby facter hiera"
+depends="${hostmakedepends}"
+short_desc="Server automation framework and application"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Apache-2.0"
+homepage="http://puppetlabs.com/facter"
+distfiles="http://downloads.puppetlabs.com/$pkgname/$pkgname-$version.tar.gz"
+checksum=4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637
+
+system_accounts="puppet"
+puppet_homedir="/var/lib/puppet"
+conf_files="
+ /etc/puppet/auth.conf
+ /etc/puppet/fileserver.conf
+ /etc/puppet/puppet.conf
+ /etc/puppet/tagmail.conf"
+
+post_install() {
+	vlicense LICENSE
+	# config files
+	vinstall ext/redhat/puppet.conf 644 etc/puppet
+	vinstall ext/redhat/logrotate 644 etc/logrotate.d puppet
+	vinstall conf/fileserver.conf 644 etc/puppet
+	vinstall conf/tagmail.conf 644 etc/puppet
+	# runit services
+	vsv puppet
+	vsv puppetmaster
+	# vim and emacs
+	vinstall ext/vim/ftdetect/$pkgname.vim 644 usr/share/vim/vimfiles/ftdetect
+	vinstall ext/vim/syntax/$pkgname.vim 644 usr/share/vim/vimfiles/syntax
+	vinstall ext/emacs/$pkgname-mode.el 644 usr/share/emacs/site-lisp
+	vinstall ext/emacs/$pkgname-mode-init.el 644 usr/share/emacs/site-lisp/site-start.d
+}