diff --git a/etc/fish.in b/etc/fish.in
index ef9bcf4da..f4bb6516b 100644
--- a/etc/fish.in
+++ b/etc/fish.in
@@ -38,6 +38,21 @@ for i in $path_list
 end
 
 
+#
+# Set some value for LANG if nothing was set before, and this is a
+# login shell. Also check for i18n information in /etc/sysconfig/i18n
+#
+
+if status --is-login
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+end
+
 #
 # Put linux console in unicode mode. Should this be done in any other
 # situation as well?
diff --git a/share/fish b/share/fish
index 137f4892a..bac65927e 100644
--- a/share/fish
+++ b/share/fish
@@ -10,21 +10,6 @@
 
 set -g fish_function_path $PWD/functions/
 
-#
-# Set some value for LANG if nothing was set before, and this is a
-# login shell. Also check for i18n information in /etc/sysconfig/i18n
-#
-
-if status --is-login
-	if not set -q LANG >/dev/null
-		set -gx LANG en_US.UTF-8
-	end
-
-	if test -f /etc/sysconfig/i18n
-		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
-	end
-end
-
 #
 # Don't need completions in non-interactive mode
 #