diff --git a/fixincludes/fixinc.in b/fixincludes/fixinc.in
index 0c3066452c6..0bd8027a554 100755
--- a/fixincludes/fixinc.in
+++ b/fixincludes/fixinc.in
@@ -258,9 +258,10 @@ then echo "All directories (including links to directories):"
      echo $all_dirs
 fi
 
+OLDDIR=`${PWDCMD}`
 cd $LIB
 echo "$all_dirs" | xargs mkdir -p
-cd ..
+cd ${OLDDIR}
 
 mkdir $LIB/root