diff --git a/configure.ac b/configure.ac
index cd8392739..a358da1fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,7 +170,7 @@ AC_TRY_LINK([#if HAVE_LIBINTL_H]
 if test "$have__nl_msg_cat_cntr" = yes; then
     AC_MSG_RESULT(yes)
 	AC_DEFINE([HAVE__NL_MSG_CAT_CNTR], [1],
-			  [Define to 1 if the _nl_msg_cat_cntr synbol is exported.])	
+	          [Define to 1 if the _nl_msg_cat_cntr symbol is exported.])	
 else
     AC_MSG_RESULT(no)
 fi
diff --git a/init/fish.in b/init/fish.in
index 0b2302ea7..389b70dc6 100644
--- a/init/fish.in
+++ b/init/fish.in
@@ -32,10 +32,9 @@ for i in $path_list
 end
 
 
-
-
 #
-# Set some value for LANG if nothing was set before
+# 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
@@ -72,6 +71,12 @@ for i in DISPLAY
 	end
 end
 
+#
+# Alias for gettext (or a fallback if gettext isn't installed) This
+# needs to be defined here and not in fish_function.fish, since it is
+# used by other init files.
+#
+
 if which gettext >/dev/null ^/dev/null
 	function _ -d "Alias for the gettext command"
 		gettext fish $argv
diff --git a/init/fish_interactive.fish.in b/init/fish_interactive.fish.in
index af066cca2..435fa5a1e 100644
--- a/init/fish_interactive.fish.in
+++ b/init/fish_interactive.fish.in
@@ -40,7 +40,7 @@ end
 # @SYSCONFDIR@/fish_inputrc.
 #
 
-for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/etc/fish_inputrc /etc/fish_inputrc ~/.inputrc /etc/inputrc
+for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/.inputrc /etc/inputrc
 	if test -f $i
 		set -xg INPUTRC $i
 		break
@@ -119,5 +119,9 @@ if command ls --color=auto --help 1>/dev/null 2>/dev/null
 end
 
 
+#
+# Remove temporary functions
+#
+
 functions -e set_default_color
 functions -e set_exported_default