diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/common/shlibs
similarity index 100%
rename from xbps-src/common/mapping_shlib_binpkg.txt
rename to common/shlibs
diff --git a/xbps-src/common/fetch_sites.sh b/common/vars.sh
similarity index 75%
rename from xbps-src/common/fetch_sites.sh
rename to common/vars.sh
index 212e1dd46fb..b105ed600e0 100644
--- a/xbps-src/common/fetch_sites.sh
+++ b/common/vars.sh
@@ -1,8 +1,7 @@
-# 
-# HTTP/FTP vars that can be used by templates.
 #
-
-# SITE used for ditfiles mirrors
+# Common variables that can be used by xbps-src.
+#
+# SITE used for ditfiles mirrors. For use in $distfiles.
 SOURCEFORGE_SITE="http://downloads.sourceforge.net/sourceforge"
 NONGNU_SITE="http://download.savannah.nongnu.org/releases"
 UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
@@ -16,7 +15,6 @@ MOZILLA_SITE="http://ftp.mozilla.org/pub/mozilla.org"
 GNU_SITE="http://mirrors.kernel.org/gnu"
 FREEDESKTOP_SITE="http://freedesktop.org/software"
 
-
-# repetative sub homepage's with no real project page
-# ie. some gnome and xorg projects
+# Repetitive sub homepage's with no real project page
+# ie. some gnome and xorg projects. For use in $homepage.
 XORG_HOME="http://xorg.freedesktop.org/wiki/"
diff --git a/xbps-src/Makefile b/xbps-src/Makefile
index bb7705b60a3..4ad676dbd3e 100644
--- a/xbps-src/Makefile
+++ b/xbps-src/Makefile
@@ -1,7 +1,7 @@
 include vars.mk
 
 BINS	= xbps-src
-SUBDIRS	= etc common libexec helpers shutils
+SUBDIRS	= etc libexec helpers shutils
 
 .PHONY: all
 all:
diff --git a/xbps-src/common/Makefile b/xbps-src/common/Makefile
deleted file mode 100644
index 435f28b49c4..00000000000
--- a/xbps-src/common/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-include ../vars.mk
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
-
-.PHONY: install
-install:
-	install -d $(DESTDIR)$(SHAREDIR)/common
-	install -m 644 *.sh *.txt $(DESTDIR)$(SHAREDIR)/common
-
-.PHONY: uninstall
-uninstall:
-	-rm -rf $(DESTDIR)$(SHAREDIR)/common
diff --git a/xbps-src/etc/Makefile b/xbps-src/etc/Makefile
index be22b65efce..f9277a0b7bb 100644
--- a/xbps-src/etc/Makefile
+++ b/xbps-src/etc/Makefile
@@ -24,7 +24,6 @@ install:
 	if [ ! -d $(DESTDIR)$(ETCDIR) ]; then		\
 		install -d $(DESTDIR)$(ETCDIR);		\
 	fi
-
 	if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then 	\
 		install -m644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \
 	fi
diff --git a/xbps-src/shutils/init_funcs.sh b/xbps-src/shutils/init_funcs.sh
index 60acbe98aaa..5d14960c0ae 100644
--- a/xbps-src/shutils/init_funcs.sh
+++ b/xbps-src/shutils/init_funcs.sh
@@ -29,10 +29,10 @@ set_defvars()
 
 	XBPS_HELPERSDIR=${XBPS_SHAREDIR}/helpers
 	XBPS_SHUTILSDIR=${XBPS_SHAREDIR}/shutils
-	XBPS_COMMONVARSDIR=${XBPS_SHAREDIR}/common
 	XBPS_META_PATH=$XBPS_MASTERDIR/var/db/xbps
 	XBPS_PKGMETADIR=$XBPS_META_PATH/metadata
 	XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs
+	XBPS_COMMONDIR=${XBPS_DISTRIBUTIONDIR}/common
 
 	if [ -n "$IN_CHROOT" ]; then
 		XBPS_DESTDIR=/destdir
@@ -50,8 +50,7 @@ set_defvars()
 	fi
 	XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
 
-	DDIRS="TRIGGERSDIR HELPERSDIR SRCPKGDIR COMMONVARSDIR SHUTILSDIR"
-	DDIRS="$DDIRS DISTRIBUTIONDIR"
+	DDIRS="DISTRIBUTIONDIR TRIGGERSDIR HELPERSDIR SRCPKGDIR SHUTILSDIR COMMONDIR"
 	for i in ${DDIRS}; do
 		eval val="\$XBPS_$i"
 		if [ ! -d "$val" ]; then
diff --git a/xbps-src/shutils/show_revdeps.sh b/xbps-src/shutils/show_revdeps.sh
index c45a277e96b..3bdac789dd1 100644
--- a/xbps-src/shutils/show_revdeps.sh
+++ b/xbps-src/shutils/show_revdeps.sh
@@ -63,7 +63,7 @@ _show_shlib_pkg_deps()
 
 show_pkg_revdeps()
 {
-	local SHLIBS_MAP="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
+	local SHLIBS_MAP=$XBPS_COMMONDIR/shlibs
 	local _pkgn shlibs
 
 	[ -z "$1" ] && return 1
diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh
index fcd364715fc..29054df0385 100644
--- a/xbps-src/shutils/tmpl_funcs.sh
+++ b/xbps-src/shutils/tmpl_funcs.sh
@@ -30,7 +30,7 @@ info_tmpl()
 {
 	local i=
 
-	for f in $XBPS_COMMONVARSDIR/*.sh; do
+	for f in $XBPS_COMMONDIR/*.sh; do
 		[ -r ${f} ] && . ${f}
 	done
 
@@ -132,7 +132,7 @@ setup_tmpl()
 		[ -n "$DESTDIR" ] && return 0
 	fi
 
-	for f in $XBPS_COMMONVARSDIR/*.sh; do
+	for f in $XBPS_COMMONDIR/*.sh; do
 		[ -r ${f} ] && . ${f}
 	done
 
diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh
index b6083473804..a5e47221f7e 100644
--- a/xbps-src/shutils/verify_rundeps.sh
+++ b/xbps-src/shutils/verify_rundeps.sh
@@ -46,7 +46,7 @@ verify_rundeps()
 	local j f nlib verify_deps maplib found_dup igndir soname_arch
 	local broken rdep found rsonamef soname_list revbumped tmplf newrev
 
-	maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
+	maplib=$XBPS_COMMONDIR/shlibs
 
 	[ -n "$noarch" -o -n "$noverifyrdeps" ] && return 0
 	msg_normal "$pkgver: verifying required shlibs...\n"