diff --git a/src/daemons.d/org.pcbsd.sysadm-rest.json.dist b/src/daemons.d/org.pcbsd.sysadm-rest.json.dist
index 350805d..6b2ad52 100644
--- a/src/daemons.d/org.pcbsd.sysadm-rest.json.dist
+++ b/src/daemons.d/org.pcbsd.sysadm-rest.json.dist
@@ -1,5 +1,5 @@
 {
 	"Label": "org.pcbsd.sysadm-rest",
 	"ProgramArguments": [ "/usr/local/bin/sysadm-server", "-rest" ],
-	"RunAtLoad": true
+	"RunAtLoad": false
 }
diff --git a/src/daemons.d/org.pcbsd.sysadm.json.dist b/src/daemons.d/org.pcbsd.sysadm.json.dist
index 10f333c..ee6955c 100644
--- a/src/daemons.d/org.pcbsd.sysadm.json.dist
+++ b/src/daemons.d/org.pcbsd.sysadm.json.dist
@@ -1,5 +1,5 @@
 {
 	"Label": "org.pcbsd.sysadm-rest",
 	"Program": "/usr/local/bin/sysadm-server",
-	"RunAtLoad": false
+	"RunAtLoad": true
 }
diff --git a/src/port-files/pkg-plist b/src/port-files/pkg-plist
index f8cad58..f5cafe3 100644
--- a/src/port-files/pkg-plist
+++ b/src/port-files/pkg-plist
@@ -5,3 +5,5 @@ etc/launchd/daemons/org.pcbsd.sysadm-rest.json.dist
 etc/sysadm.conf.dist
 etc/rc.d/sysadm
 etc/rc.d/sysadm-rest
+share/launchd/daemons/org.pcbsd.sysadm.json
+share/launchd/daemons/org.pcbsd.sysadm-rest.json
diff --git a/src/sysadm.pro b/src/sysadm.pro
index 5fac439..d4cf05f 100644
--- a/src/sysadm.pro
+++ b/src/sysadm.pro
@@ -10,10 +10,16 @@ SUBDIRS+= server
 rcd.path = /usr/local/etc/rc.d/
 rcd.extra = cp rc.d/* $(INSTALL_ROOT)/usr/local/etc/rc.d/
 
-daemons.path = /usr/local/etc/launchd/daemons/
-daemons.extra = cp daemons.d/* $(INSTALL_ROOT)/usr/local/etc/launchd/daemons/
+dconf.path = /usr/local/etc/launchd/daemons/
+dconf.extra = cp daemons.d/* $(INSTALL_ROOT)/usr/local/etc/launchd/daemons/
+
+wsdaemon.path = /usr/local/share/launchd/daemons/
+wsdaemon.extra = cp daemons.d/org.pcbsd.sysadm.json.dist $(INSTALL_ROOT)/usr/local/share/launchd/daemons/org.pcbsd.sysadm.json
+
+rstdaemon.path = /usr/local/share/launchd/daemons/
+rstdaemon.extra = cp daemons.d/org.pcbsd.sysadm-rest.json.dist $(INSTALL_ROOT)/usr/local/share/launchd/daemons/org.pcbsd.sysadm-rest.json
 
 conf.path = /usr/local/etc/
 conf.extra = cp conf/sysadm.conf ${INSTALL_ROOT}/usr/local/etc/sysadm.conf.dist
 
-INSTALLS += rcd conf daemons
+INSTALLS += rcd conf wsdaemon rstdaemon dconf