diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
new file mode 100644
index 00000000000..14ee8daad0c
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec automount -f
diff --git a/srcpkgs/autofs/patches/autofs-5.1.0-fix-compile-error-in-defaults_c.patch b/srcpkgs/autofs/patches/autofs-5.1.0-fix-compile-error-in-defaults_c.patch
new file mode 100644
index 00000000000..2ad5e7b9cfa
--- /dev/null
+++ b/srcpkgs/autofs/patches/autofs-5.1.0-fix-compile-error-in-defaults_c.patch
@@ -0,0 +1,18 @@
+autofs-5.1.0 - fix compile error in defaults.c
+
+From: Ian Kent <raven@themaw.net>
+
+Puzzling, suddenly I'm getting a compile error for defaults.c due
+to a lack of including stdarg.h.
+diff --git a/lib/defaults.c b/lib/defaults.c
+index 2b03ea2..d29a976 100644
+--- lib/defaults.c
++++ lib/defaults.c
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ #include <sys/utsname.h>
+ #include <sys/stat.h>
++#include <stdarg.h>
+ 
+ #include "config.h"
+ #include "list.h"
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
new file mode 100644
index 00000000000..89f3d54cbad
--- /dev/null
+++ b/srcpkgs/autofs/template
@@ -0,0 +1,24 @@
+# Template file for 'autofs'
+pkgname=autofs
+version=5.1.0
+revision=1
+build_style=gnu-configure
+conf_files="
+ /etc/autofs/auto.master
+ /etc/autofs/auto.misc
+ /etc/autofs/autofs.conf
+ /etc/autofs/autofs_ldap_auth.conf
+ /etc/default/autofs"
+configure_args="--with-libtirpc --with-mapdir=/etc/autofs"
+hostmakedepends="flex kmod"
+makedepends="libtirpc-devel"
+short_desc="A kernel-based automounter for Linux"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://www.gnu.org/software/sed"
+distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
+checksum=f4b343797e6df03627a9fd41bda6fd85acb84aa3fdd15694eec03ec90a52bc27
+
+post_install() {
+	vsv $pkgname
+}