diff --git a/compiler/utils/samplecfg b/compiler/utils/samplecfg
index 0671b147a2..c48c0b9e6a 100644
--- a/compiler/utils/samplecfg
+++ b/compiler/utils/samplecfg
@@ -25,7 +25,7 @@ FPCBIN=`dirname "$1"`/../../bin/fpc
 FPBIN=`dirname "$1"`/../../bin/fp
 FPPKGBIN=`dirname "$1"`/../../bin/fppkg
 FPCMKCFGBIN=`dirname "$1"`/../../bin/fpcmkcfg
-SHAREPATH=`dirname "$1"`/../../../share
+SHAREPATH=`dirname "$1"`/../../share/fpc/\$fpcversion
 # Look for one in the PATH, if no new one was installed.
 if [ ! -f $FPCMKCFGBIN ]; then
   FPCMKCFGBIN=fpcmkcfg
@@ -74,7 +74,7 @@ FPCGLOBALPREFIX=`dirname "$1"`/../../
 
 # Write (.)fpc.cfg
 echo Writing sample configuration file to $fpccfgfile
-${FPCMKCFGBIN} -d "basepath=$FPCPATH sharepath=$SHAREPATH" -o $fpccfgfile
+${FPCMKCFGBIN} -d "basepath=$FPCPATH" -d "sharepath=$SHAREPATH" -o $fpccfgfile
 
 if ! [ -f "$FPBIN" ] ; then
   exit
@@ -82,7 +82,7 @@ fi
 
 # Write fp.cfg
 echo Writing sample configuration file to $fpcfgfile
-${FPCMKCFGBIN} -p -1 -d "basepath=$FPCPATH sharepath=$SHAREPATH" -o $fpcfgfile
+${FPCMKCFGBIN} -p -1 -d "basepath=$FPCPATH" -d "sharepath=$SHAREPATH" -o $fpcfgfile
 
 # Write fp.ini
 echo Writing sample configuration file to $fpinifile