diff --git a/gitprompt.sh b/gitprompt.sh
index 25b5bcf1..ba16aeb9 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -480,7 +480,7 @@ function createPrivateIndex {
   else
     __GIT_INDEX_FILE="${GIT_INDEX_FILE}"
   fi
-  __GIT_INDEX_PRIVATE="/tmp/git-index-private$$"
+  __GIT_INDEX_PRIVATE="${TMPDIR:-/tmp}/git-index-private$$"
   command cp "${__GIT_INDEX_FILE}" "${__GIT_INDEX_PRIVATE}" 2>/dev/null
   echo "${__GIT_INDEX_PRIVATE}"
 }
diff --git a/gitstatus.sh b/gitstatus.sh
index 76ffb43c..e8f921dc 100755
--- a/gitstatus.sh
+++ b/gitstatus.sh
@@ -105,7 +105,6 @@ while IFS='' read -r line || [[ -n "${line}" ]]; do
       AA) ((num_conflicts++)); break;;
       #two character matches, first loop
       ?M) ((num_changed++)) ;;
-      ?D) ((num_changed++)) ;;
       ?\ ) ;;
       #single character matches, second loop
       U) ((num_conflicts++)) ;;