diff --git a/bash_completion/msm b/bash_completion/msm
index db6625a..3efa717 100644
--- a/bash_completion/msm
+++ b/bash_completion/msm
@@ -1,6 +1,12 @@
+
+# Source, if it exists, the msm profile.d script
+if [ -f "/etc/profile.d/msm.sh" ]; then
+	source "/etc/profile.d/msm.sh"
+fi
+
 ### Utility Functions
 
-MSM="/etc/init.d/msm"
+MSM="${MSM_SCRIPT:-/etc/init.d/msm}"
 
 # Loads variables
 __init() {
diff --git a/init/msm b/init/msm
index b12e7b5..e302604 100755
--- a/init/msm
+++ b/init/msm
@@ -18,7 +18,10 @@
 # this script.
 
 
-### The configuration file
+# Source, if it exists, the msm profile.d script
+if [ -f "/etc/profile.d/msm.sh" ]; then
+	source "/etc/profile.d/msm.sh"
+fi
 
 # Get the MSM_CONF environment variable or use the default location
 CONF="${MSM_CONF:-/etc/msm.conf}"