diff --git a/portshaker/portshaker.conf b/portshaker/portshaker.conf
new file mode 100644
index 0000000..b5ea52d
--- /dev/null
+++ b/portshaker/portshaker.conf
@@ -0,0 +1,12 @@
+# vim:set syntax=sh:
+# $Id$
+
+#---[ Base directory for mirrored Ports Trees ]---
+mirror_base_dir="/var/cache/portshaker"
+
+#---[ Directories where to merge ports ]---
+ports_trees="main"
+
+main_ports_tree="/usr/local/poudriere/ports/default"
+main_merge_from="freebsd kiwi"
+
diff --git a/portshaker/portshaker.d/freebsd b/portshaker/portshaker.d/freebsd
new file mode 100755
index 0000000..6f89080
--- /dev/null
+++ b/portshaker/portshaker.d/freebsd
@@ -0,0 +1,8 @@
+#!/bin/sh
+. /usr/local/share/portshaker/portshaker.subr
+if [ "$1" != '--' ]; then
+  err 1 "Extra arguments"
+fi
+shift
+method="portsnap"
+run_portshaker_command $*
diff --git a/portshaker/portshaker.d/kiwi b/portshaker/portshaker.d/kiwi
new file mode 100755
index 0000000..6ae1d8f
--- /dev/null
+++ b/portshaker/portshaker.d/kiwi
@@ -0,0 +1,10 @@
+#!/bin/sh
+. /usr/local/share/portshaker/portshaker.subr
+if [ "$1" != '--' ]; then
+  err 1 "Extra arguments"
+fi
+shift
+method="git"
+git_clone_uri="https://framagit.org/kiwi/freebsd-ports.git"
+git_branch=master
+run_portshaker_command $*