diff --git a/xbps-src/etc/Makefile b/xbps-src/etc/Makefile
index 85b2b151a4b..be22b65efce 100644
--- a/xbps-src/etc/Makefile
+++ b/xbps-src/etc/Makefile
@@ -25,8 +25,8 @@ install:
 		install -d $(DESTDIR)$(ETCDIR);		\
 	fi
 
-	if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then		\
-		install -m 644 $(CONF_FILE) $(DESTDIR)$(ETCDIR);	\
+	if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then 	\
+		install -m644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \
 	fi
 
 .PHONY: uninstall
diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh
index c696108c154..96b8847f6d5 100644
--- a/xbps-src/shutils/chroot.sh
+++ b/xbps-src/shutils/chroot.sh
@@ -66,7 +66,7 @@ chroot_init()
 		mkdir -p $XBPS_MASTERDIR/usr/local/etc
 	fi
 
-	XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps-src.conf
+	XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps/xbps-src.conf
 
 	cat > $XBPSSRC_CF <<_EOF
 # Generated configuration file by xbps-src, DO NOT EDIT!
@@ -107,7 +107,7 @@ _EOF
 	cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF
 #!/bin/sh
 
-. /usr/local/etc/xbps-src.conf
+. /usr/local/etc/xbps/xbps-src.conf
 . /usr/local/share/xbps-src/shutils/init_funcs.sh
 set_defvars
 
diff --git a/xbps-src/vars.mk b/xbps-src/vars.mk
index c9eb0e74e7c..557bbd9fc74 100644
--- a/xbps-src/vars.mk
+++ b/xbps-src/vars.mk
@@ -7,4 +7,4 @@ SBINDIR	?= $(DESTDIR)$(PREFIX)/sbin
 #
 SHAREDIR ?= $(PREFIX)/share/xbps-src
 LIBEXECDIR ?= $(PREFIX)/libexec/xbps-src
-ETCDIR	?= $(PREFIX)/etc
+ETCDIR	?= $(PREFIX)/etc/xbps
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 28dcb433a31..f123b093651 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -23,7 +23,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #-
-readonly XBPS_SRC_BUILD_VERSION=20111118
+readonly XBPS_SRC_BUILD_VERSION=20111118-1
 
 if [ -n "$IN_CHROOT" ]; then
 	export XBPS_ETCDIR=/usr/local/etc/xbps