diff --git a/srcpkgs/xbps-base-files/files/dot_bashrc b/srcpkgs/xbps-base-files/files/dot_bashrc
index c4b7f22fed..1de28403a6 100644
--- a/srcpkgs/xbps-base-files/files/dot_bashrc
+++ b/srcpkgs/xbps-base-files/files/dot_bashrc
@@ -5,4 +5,15 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+# Source again stuff in /etc/profile.d in case it hasn't been.
+for i in /etc/profile.d/*.sh ; do
+	if [ -r "$i" ]; then
+		if [ "$PS1" ]; then
+			. $i
+		else
+			. $i >/dev/null 2>&1
+		fi
+	fi
+done
+
 # User specific aliases and functions
diff --git a/srcpkgs/xbps-base-files/template b/srcpkgs/xbps-base-files/template
index 289153080b..b2b4cac8b4 100644
--- a/srcpkgs/xbps-base-files/template
+++ b/srcpkgs/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.39
+version=0.40
 build_style=custom-install
 short_desc="XBPS Base System files"
 maintainer="Juan RP <xtraeme@gmail.com>"