diff --git a/autojump.bash b/autojump.bash
index 914c374..e1b9685 100644
--- a/autojump.bash
+++ b/autojump.bash
@@ -66,7 +66,13 @@ if [ -d ~/.autojump/ ]; then
 fi
 
 export AUTOJUMP_HOME=${HOME}
-AUTOJUMP='{ [[ "$AUTOJUMP_HOME" == "$HOME" ]] && (autojump -a "$(pwd -P)"&)>/dev/null 2>>"${AUTOJUMP_DATA_DIR}/.autojump_errors";} 2>/dev/null'
+if [ "${AUTOJUMP_KEEP_SYMLINKS}" == "1" ]
+then
+    _PWD_ARGS=""
+else
+    _PWD_ARGS="-P"
+fi
+AUTOJUMP='{ [[ "$AUTOJUMP_HOME" == "$HOME" ]] && (autojump -a "$(pwd ${_PWD_ARGS})"&)>/dev/null 2>>"${AUTOJUMP_DATA_DIR}/.autojump_errors";} 2>/dev/null'
 
 case $PROMPT_COMMAND in
     *autojump*)    ;;
@@ -75,3 +81,4 @@ esac
 
 alias jumpstat="autojump --stat"
 function j { new_path="$(autojump $@)";if [ -n "$new_path" ]; then echo -e "\\033[31m${new_path}\\033[0m"; cd "$new_path";else false; fi }
+
diff --git a/autojump.zsh b/autojump.zsh
index b9fa085..83dde8a 100644
--- a/autojump.zsh
+++ b/autojump.zsh
@@ -35,7 +35,13 @@ if [[ -d ~/.autojump/ ]]; then
 fi
 
 function autojump_preexec() {
-    { (autojump -a "$(pwd -P)"&)>/dev/null 2>>|${AUTOJUMP_DATA_DIR}/.autojump_errors ; } 2>/dev/null
+    if [[ "${AUTOJUMP_KEEP_SYMLINKS}" == "1" ]]
+    then
+        _PWD_ARGS=""
+    else
+        _PWD_ARGS="-P"
+    fi
+    { (autojump -a "$(pwd ${_PWD_ARGS})"&)>/dev/null 2>>|${AUTOJUMP_DATA_DIR}/.autojump_errors ; } 2>/dev/null
 }
 
 typeset -ga preexec_functions