diff -urN ejabberd-14.07.org/ejabberdctl.template ejabberd-14.07/ejabberdctl.template
--- ejabberd-14.07.org/ejabberdctl.template	2014-07-22 17:42:49.000000000 +0200
+++ ejabberd-14.07/ejabberdctl.template	2014-10-15 09:38:33.692517899 +0200
@@ -8,6 +8,7 @@
 ERL_MAX_ETS_TABLES=1400
 FIREWALL_WINDOW=""
 ERLANG_NODE=ejabberd@localhost
+HOME=/home/services/jabber; export HOME
 
 # define default environment variables
 SCRIPT_DIR=`cd ${0%/*} && pwd`
@@ -58,7 +58,7 @@ for arg; do
 done
 
 # define ejabberd variables if not already defined from the command line
-: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
+: "${ETC_DIR:="{{sysconfdir}}/jabber"}"
 : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
 : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
 : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
@@ -82,7 +82,7 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
 fi
 ERL_LIBS={{libdir}}
 ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
-ERL_INETRC="$ETC_DIR"/inetrc
+ERL_INETRC="$ETC_DIR"/ejabberd-inetrc
 
 # define ejabberd parameters
 EJABBERD_OPTS="$EJABBERD_OPTS\
diff -urN ejabberd-14.07.org/Makefile.in ejabberd-14.07/Makefile.in
--- ejabberd-14.07.org/Makefile.in	2014-07-22 17:42:49.000000000 +0200
+++ ejabberd-14.07/Makefile.in	2014-10-15 09:32:42.603846549 +0200
@@ -9,7 +9,7 @@
 DESTDIR =
 
 # /etc/ejabberd/
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+ETCDIR = $(DESTDIR)@sysconfdir@/jabber
 
 # /sbin/
 SBINDIR = $(DESTDIR)@sbindir@
@@ -123,7 +123,7 @@
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
 		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc
 	#
 	# Administration script
 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)