diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index e1d9ba2..6b166da 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.15
+pkgver=2.16
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/rc/module.8021q/down b/main/nnd-s6-services/rc/module.8021q/down
new file mode 100644
index 0000000..52b2283
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.8021q/down
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE 8021q
+
+exec /usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.8021q/flag-essential b/main/nnd-s6-services/rc/module.8021q/flag-essential
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/module.8021q/type b/main/nnd-s6-services/rc/module.8021q/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.8021q/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/module.8021q/up b/main/nnd-s6-services/rc/module.8021q/up
new file mode 100644
index 0000000..1ae3c77
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.8021q/up
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE 8021q
+
+exec /usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.dummy/down b/main/nnd-s6-services/rc/module.dummy/down
new file mode 100644
index 0000000..e9ec923
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.dummy/down
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE dummy
+
+exec /usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.dummy/flag-essential b/main/nnd-s6-services/rc/module.dummy/flag-essential
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/module.dummy/type b/main/nnd-s6-services/rc/module.dummy/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.dummy/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/module.dummy/up b/main/nnd-s6-services/rc/module.dummy/up
new file mode 100644
index 0000000..2cac83e
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.dummy/up
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE dummy
+
+exec /usr/libexec/nnd/s6/modprobe
diff --git a/main/nnd-s6-services/rc/module.vrf/down b/main/nnd-s6-services/rc/module.vrf/down
new file mode 100644
index 0000000..3267077
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.vrf/down
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE vrf
+
+exec /usr/libexec/nnd/s6/rmmod
diff --git a/main/nnd-s6-services/rc/module.vrf/flag-essential b/main/nnd-s6-services/rc/module.vrf/flag-essential
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/module.vrf/type b/main/nnd-s6-services/rc/module.vrf/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.vrf/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/module.vrf/up b/main/nnd-s6-services/rc/module.vrf/up
new file mode 100644
index 0000000..354f9df
--- /dev/null
+++ b/main/nnd-s6-services/rc/module.vrf/up
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export MODULE vrf
+
+exec /usr/libexec/nnd/s6/modprobe