diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 638bd4dcb080..8d62392dd366 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Online presence and instant messaging server
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS= --localstatedir=/var \
+		--with-libiconv-prefix=${LOCALBASE} \
 		--enable-storage='${STORAGE}' \
 		--enable-authreg='${AUTHREG}'
 
diff --git a/net-im/jabberd/pkg-deinstall b/net-im/jabberd/pkg-deinstall
index ec0a1eb4d869..8a4fe0fcabf9 100644
--- a/net-im/jabberd/pkg-deinstall
+++ b/net-im/jabberd/pkg-deinstall
@@ -16,4 +16,6 @@ if pw groupshow "${USER}" 2>/dev/null 1>&2; then
 	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
 fi
 
+echo "If you wish to delete jabber data files, remove '/var/jabberd' directory."
+
 exit 0
diff --git a/net-im/jabberd/pkg-install b/net-im/jabberd/pkg-install
index 43cb7753583f..e45dcc1b3e2c 100644
--- a/net-im/jabberd/pkg-install
+++ b/net-im/jabberd/pkg-install
@@ -31,4 +31,8 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 		exit 1
 	fi
 fi
+
+mkdir -p /var/jabberd/db /var/jabberd/pid /var/jabberd/log
+chown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
+
 exit 0
diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index 638bd4dcb080..8d62392dd366 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Online presence and instant messaging server
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \
+CONFIGURE_ARGS= --localstatedir=/var \
+		--with-libiconv-prefix=${LOCALBASE} \
 		--enable-storage='${STORAGE}' \
 		--enable-authreg='${AUTHREG}'
 
diff --git a/net/jabberd/pkg-deinstall b/net/jabberd/pkg-deinstall
index ec0a1eb4d869..8a4fe0fcabf9 100644
--- a/net/jabberd/pkg-deinstall
+++ b/net/jabberd/pkg-deinstall
@@ -16,4 +16,6 @@ if pw groupshow "${USER}" 2>/dev/null 1>&2; then
 	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
 fi
 
+echo "If you wish to delete jabber data files, remove '/var/jabberd' directory."
+
 exit 0
diff --git a/net/jabberd/pkg-install b/net/jabberd/pkg-install
index 43cb7753583f..e45dcc1b3e2c 100644
--- a/net/jabberd/pkg-install
+++ b/net/jabberd/pkg-install
@@ -31,4 +31,8 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 		exit 1
 	fi
 fi
+
+mkdir -p /var/jabberd/db /var/jabberd/pid /var/jabberd/log
+chown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
+
 exit 0