diff --git a/packaging/MANIFEST b/packaging/FreeBSD/MANIFEST
similarity index 98%
rename from packaging/MANIFEST
rename to packaging/FreeBSD/MANIFEST
index a62821b..4a9ab0a 100644
--- a/packaging/MANIFEST
+++ b/packaging/FreeBSD/MANIFEST
@@ -40,7 +40,6 @@ EOD;
     post-install = <<EOD
 mkdir -p /var/run/albatross/util /var/run/albatross/fifo
 chown albatross:albatross /var/run/albatross/util /var/run/albatross/fifo
-chmod 2760 /var/run/albatross/fifo
 
 EOD;
     post-deinstall = <<EOD
diff --git a/packaging/create_package.sh b/packaging/FreeBSD/create_package.sh
similarity index 60%
rename from packaging/create_package.sh
rename to packaging/FreeBSD/create_package.sh
index 6482dfe..d594880 100755
--- a/packaging/create_package.sh
+++ b/packaging/FreeBSD/create_package.sh
@@ -1,12 +1,16 @@
 #!/bin/sh -e
 
-basedir=$(realpath "$(dirname "$0")"/..)
+basedir=$(realpath "$(dirname "$0")"/../..)
+pdir=$basedir/packaging/FreeBSD
+bdir=$basedir/_build/default
 #tmptmpl=$(basename "$0")
 #tmpd=$(mktemp -t "$tmptmpl")
 tmpd=$basedir/_build/stage
 manifest=$tmpd/+MANIFEST
 rootdir=$tmpd/rootdir
-
+sbindir=$rootdir/usr/local/sbin
+rcdir=$rootdir/usr/local/etc/rc.d
+libexecdir=$rootdir/usr/local/libexec/albatross
 
 trap 'rm -rf $tmpd' 0 INT EXIT
 
@@ -21,30 +25,29 @@ for f in albatross_log \
 	 albatross_daemon \
 	 albatross_influx \
 	 albatross_tls
-do install -U $basedir/packaging/rc.d/$f $rootdir/usr/local/etc/rc.d/$f; done
+do install -U $pdir/rc.d/$f $rcdir/$f; done
 
 # stage albatross app binaries
 for f in albatrossd albatross_log albatross_console albatross_influx; do
-    install -U $basedir/_build/default/daemon/$f.exe \
-	 $rootdir/usr/local/libexec/albatross/$f; done
+    install -U $bdir/daemon/$f.exe $libexecdir/$f;
+done
 
 for f in albatross_tls_endpoint albatross_tls_inetd; do
-    install -U $basedir/_build/default/tls/$f.exe \
-	 $rootdir/usr/local/libexec/albatross/$f; done
+    install -U $bdir/tls/$f.exe $libexecdir/$f;
+done
 
-install -U $basedir/_build/default/stats/albatross_stats.exe \
-	 $rootdir/usr/local/libexec/albatross/albatross_stats
+install -U $bdir/stats/albatross_stats.exe $libexecdir/albatross_stats
 
-install -U $basedir/_build/default/stats/albatross_stat_client.exe \
-	 $rootdir/usr/local/sbin/albatross_stat_client
+install -U $bdir/stats/albatross_stat_client.exe $sbindir/albatross_stat_client
 
-for f in albatross_client_local albatross_client_remote_tls albatross_client_bistro; do
-    install -U $basedir/_build/default/client/$f.exe \
-	$rootdir/usr/local/sbin/$f; done
+for f in albatross_client_local \
+             albatross_client_remote_tls \
+             albatross_client_bistro
+do install -U $bdir/client/$f.exe $sbindir/$f; done
 
 for f in albatross_provision_ca albatross_provision_request; do
-    install -U $basedir/_build/default/provision/$f.exe \
-	$rootdir/usr/local/sbin/$f; done
+    install -U $bdir/provision/$f.exe $sbindir/$f;
+done
 
 # create +MANIFEST
 flatsize=$(find "$rootdir" -type f -exec stat -f %z {} + |
@@ -53,7 +56,7 @@ flatsize=$(find "$rootdir" -type f -exec stat -f %z {} + |
 gitver=$(git rev-parse --short HEAD)
 
 sed -e "s:%%GITVER%%:${gitver}:" -e "s:%%FLATSIZE%%:${flatsize}:" \
-    "$basedir/packaging/MANIFEST" > "$manifest"
+    "$pdir/MANIFEST" > "$manifest"
 
 {
     printf '\nfiles {\n'
diff --git a/packaging/rc.d/albatross_console b/packaging/FreeBSD/rc.d/albatross_console
similarity index 100%
rename from packaging/rc.d/albatross_console
rename to packaging/FreeBSD/rc.d/albatross_console
diff --git a/packaging/rc.d/albatross_daemon b/packaging/FreeBSD/rc.d/albatross_daemon
similarity index 100%
rename from packaging/rc.d/albatross_daemon
rename to packaging/FreeBSD/rc.d/albatross_daemon
diff --git a/packaging/rc.d/albatross_influx b/packaging/FreeBSD/rc.d/albatross_influx
similarity index 100%
rename from packaging/rc.d/albatross_influx
rename to packaging/FreeBSD/rc.d/albatross_influx
diff --git a/packaging/rc.d/albatross_log b/packaging/FreeBSD/rc.d/albatross_log
similarity index 100%
rename from packaging/rc.d/albatross_log
rename to packaging/FreeBSD/rc.d/albatross_log
diff --git a/packaging/rc.d/albatross_stat b/packaging/FreeBSD/rc.d/albatross_stat
similarity index 100%
rename from packaging/rc.d/albatross_stat
rename to packaging/FreeBSD/rc.d/albatross_stat
diff --git a/packaging/rc.d/albatross_tls b/packaging/FreeBSD/rc.d/albatross_tls
similarity index 100%
rename from packaging/rc.d/albatross_tls
rename to packaging/FreeBSD/rc.d/albatross_tls