Index: Makefile
===================================================================
--- Makefile	(revision 310795)
+++ Makefile	(working copy)
@@ -7,7 +7,7 @@
 
 PORTNAME=	boxbackup
 PORTVERSION=	0.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	${CLIENT_OR_SERVER}
@@ -101,12 +101,12 @@
 
 post-install:
 .if !defined(WITHOUT_CLIENT)
-	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbackupd
+	@${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbackupd
 	@${MKDIR} ${PREFIX}/etc/periodic/monthly
 	${INSTALL_SCRIPT} ${WRKDIR}/999.boxbackup ${PREFIX}/etc/periodic/monthly
 .endif
 .if !defined(WITHOUT_SERVER)
-	@${MKDIR} -m 0700 ${PREFIX}/etc/box/bbstored
+	@${MKDIR} -m 0700 ${PREFIX}/etc/boxbackup/bbstored
 .endif
 	@${CAT} ${PKGMESSAGE}
 
Index: files/bbackupd.in
===================================================================
--- files/bbackupd.in	(revision 310795)
+++ files/bbackupd.in	(working copy)
@@ -18,7 +18,7 @@
 load_rc_config $name
 
 : ${bbackupd_enable:="NO"}
-: ${bbackupd_flags:="%%PREFIX%%/etc/box/bbackupd.conf"}
+: ${bbackupd_flags:="%%PREFIX%%/etc/boxbackup/bbackupd.conf"}
 
 pidfile=${bbackupd_pidfile:-"/var/run/bbackupd.pid"}
 
Index: files/bbstored.in
===================================================================
--- files/bbstored.in	(revision 310795)
+++ files/bbstored.in	(working copy)
@@ -18,7 +18,7 @@
 load_rc_config $name
 
 : ${bbstored_enable:="NO"}
-: ${bbstored_flags:="%%PREFIX%%/etc/box/bbstored.conf"}
+: ${bbstored_flags:="%%PREFIX%%/etc/boxbackup/bbstored.conf"}
 
 pidfile=${bbstored_pidfile:-"/var/run/bbstored.pid"}
 
Index: files/patch-bbackupd-config
===================================================================
--- files/patch-bbackupd-config	(revision 0)
+++ files/patch-bbackupd-config	(working copy)
@@ -0,0 +1,11 @@
+--- bin/bbackupd/bbackupd-config.in.orig	2013-01-25 13:17:39.942303010 +1300
++++ bin/bbackupd/bbackupd-config.in	2013-01-25 13:18:04.021348906 +1300
+@@ -445,7 +445,7 @@
+ 
+ Server
+ {
+-	PidFile = $working_dir/bbackupd.pid
++	PidFile = /var/run/bbackupd.pid
+ }
+ 
+ 
Index: files/pkg-message.server
===================================================================
--- files/pkg-message.server	(revision 310795)
+++ files/pkg-message.server	(working copy)
@@ -2,3 +2,7 @@
 To run bbstored at startup, add bbstored_enable="YES" to /etc/rc.conf
 Please see http://www.boxbackup.org/server.html for server configuration
 options
+
+The default location of configuration files changed from /usr/local/etc/box to
+/usr/local/etc/boxbackup, if you are upgrading then run 
+  mv /usr/local/etc/box /usr/local/etc/boxbackup
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 310795)
+++ pkg-plist	(working copy)
@@ -7,11 +7,11 @@
 %%SERVER%%sbin/bbstored-certs
 %%SERVER%%sbin/bbstored-config
 %%SERVER%%sbin/raidfile-config
-%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/box/bbackupd
-%%SERVER%%@exec mkdir -p -m 0700 %D/etc/box/bbstored
-%%CLIENT%%@dirrmtry etc/box/bbackupd
-%%SERVER%%@dirrmtry etc/box/bbstored
+%%CLIENT%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbackupd
+%%SERVER%%@exec mkdir -p -m 0700 %D/etc/boxbackup/bbstored
+%%CLIENT%%@dirrmtry etc/boxbackup/bbackupd
+%%SERVER%%@dirrmtry etc/boxbackup/bbstored
 etc/periodic/monthly/999.boxbackup
 @dirrmtry etc/periodic/monthly
 @dirrmtry etc/periodic
-@dirrmtry etc/box
+@dirrmtry etc/boxbackup