diff --git a/data/etc/profile b/data/etc/profile
index 84e291a3be..f9de4feaf9 100644
--- a/data/etc/profile
+++ b/data/etc/profile
@@ -22,14 +22,6 @@ fi
 export HISTFILESIZE=500
 export HISTCONTROL=ignoredups
 
-# Locale
-export LC_MESSAGES=`locale --message`
-export LC_NUMERIC=`locale --format`
-export LC_TIME=`locale --time`
-export LC_COLLATE=$LC_MESSAGES
-export LC_CTYPE=$LC_MESSAGES
-export LC_MONETARY=$LC_NUMERIC
-
 alias ls="ls --color=auto"
 alias ll="ls -lA"
 alias la="ls -A"
diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index d444e0b444..58974e2812 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -27,8 +27,7 @@ export BUILDHOME
 export BEINCLUDES
 export BE_HOST_CPU
 
-if [ "$SAFEMODE" != "yes" ]
-then
+if [ "$SAFEMODE" != "yes" ]; then
 	export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/system/non-packaged/bin:/bin:/boot/system/apps:/boot/system/preferences
 	export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/system/non-packaged/lib:/boot/system/lib"
 	export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/system/non-packaged/add-ons:/boot/system/add-ons"
@@ -39,17 +38,15 @@ else
 fi
 
 # Locale
-export LC_MESSAGES=`locale -m`
-export LC_NUMERIC=`locale -f`
-export LC_TIME=`locale -t`
+export LC_MESSAGES=`locale --message`
+export LC_NUMERIC=`locale --format`
+export LC_TIME=`locale --time`
 export LC_COLLATE=$LC_MESSAGES
 export LC_CTYPE=$LC_MESSAGES
 export LC_MONETARY=$LC_NUMERIC
 
-if [ "$SAFEMODE" != "yes" ]
-then
-	if [ -f $HOME/config/settings/boot/UserSetupEnvironment ]
-	then
+if [ "$SAFEMODE" != "yes" ]; then
+	if [ -f $HOME/config/settings/boot/UserSetupEnvironment ]; then
      	. $HOME/config/settings/boot/UserSetupEnvironment
 	fi
 fi