diff --git a/environment.zsh b/environment.zsh
index 08a73b6..47727f1 100644
--- a/environment.zsh
+++ b/environment.zsh
@@ -15,7 +15,30 @@ unsetopt HUP              # Don't kill jobs on shell exit.
 unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
 
 # PATH
-typeset -U path manpath cdpath fpath
+typeset -U cdpath fpath infopath manpath path
+
+cdpath=(
+  $HOME
+  $HOME/Developer
+)
+
+infopath=(
+  $HOME/.tilde/share/info
+  $HOME/.tilde/opt/share/info
+  /usr/local/share/info
+  /usr/share/info
+)
+
+manpath=(
+  $HOME/.tilde/share/man
+  $HOME/.tilde/opt/share/man
+  /usr/local/share/man
+  /usr/share/man
+)
+
+for path_file in /etc/manpaths.d/*; do
+  manpath+=($(<$path_file))
+done
 
 path=(
   $HOME/.tilde/bin
@@ -32,22 +55,6 @@ for path_file in /etc/paths.d/*; do
   path+=($(<$path_file))
 done
 
-manpath=(
-  $HOME/.tilde/share/man
-  $HOME/.tilde/opt/share/man
-  /usr/local/share/man
-  /usr/share/man
-)
-
-for path_file in /etc/manpaths.d/*; do
-  manpath+=($(<$path_file))
-done
-
-cdpath=(
-  $HOME
-  $HOME/Developer
-)
-
 # Language
 export LANG="en_AU.UTF-8"
 export LC_ALL="$LANG"