diff --git a/entrypoint.sh b/entrypoint.sh
index e418bf6..cb55370 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -94,9 +94,6 @@ export XXH_HOME=`readlink -f $CURRENT_DIR/../../../..`
 #if [[ ! -d $XXH_HOME/.local/share/<yourshell> ]]; then
 #  mkdir -p $XXH_HOME/.local/share/<yourshell>
 #fi
-#export HISTFILE=$XXH_HOME/.local/share/<yourshell>/<yourshell>_history
-
-export XDG_CONFIG_HOME=$XXH_HOME/.config
 
 if [[ $HOMEPATH != '' ]]; then
   homerealpath=`readlink -f $HOMEPATH`
@@ -111,6 +108,9 @@ else
   export HOME=$XXH_HOME
 fi
 
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_DATA_HOME=$HOME/.local/share
+
 
 #
 # Run the portable shell