diff --git a/utils/fpcmkcfg/fpcmkcfg.pp b/utils/fpcmkcfg/fpcmkcfg.pp
index 1c1fdc810b..9d1c80d3d6 100644
--- a/utils/fpcmkcfg/fpcmkcfg.pp
+++ b/utils/fpcmkcfg/fpcmkcfg.pp
@@ -166,6 +166,14 @@ begin
     result := '#DEFINE NEEDCROSSBINUTILS';
 end;
 
+function GetDefaultUserPathSuffix: string;
+begin
+  if not (StringToOS(BuildOSTarget) in AllWindowsOSes) then
+    Result := 'lib/fpc/{CompilerVersion}'
+  else
+    Result := '';
+end;
+
 function GetDefaultGCCDir: string;
 
   var
@@ -276,6 +284,7 @@ begin
   TemplateParser.Values['COMPILERCONFIGDIR'] := GetDefaultCompilerConfigDir;
   TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef;
   TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR;
+  TemplateParser.Values['USERPATHSUFFIX'] := GetDefaultUserPathSuffix;
 
   Cfg:=TStringList.Create;
   Cfg.Text:=StrPas(Addr(DefaultConfig[0][1]));
diff --git a/utils/fpcmkcfg/fppkg.cfg b/utils/fpcmkcfg/fppkg.cfg
index 6726a86bd3..4c256895f8 100644
--- a/utils/fpcmkcfg/fppkg.cfg
+++ b/utils/fpcmkcfg/fppkg.cfg
@@ -18,10 +18,10 @@ Path=%GlobalPath%
 Prefix=%GlobalPrefix%
 
 [IncludeFiles]
-FileMask=%CompilerConfigDir%/conf.d/*.conf
+FileMask=%CompilerConfigDir%conf.d/*.conf
 
 [Repository]
 Name=user
 Description=User-installed packages
-Path={LocalRepository}lib/fpc/{CompilerVersion}/
+Path={LocalRepository}%UserPathSuffix%
 Prefix={LocalRepository}
diff --git a/utils/fpcmkcfg/fppkg.inc b/utils/fpcmkcfg/fppkg.inc
index ac4060880b..65e1f7785f 100644
--- a/utils/fpcmkcfg/fppkg.inc
+++ b/utils/fpcmkcfg/fppkg.inc
@@ -24,11 +24,11 @@ const fppkg : array[0..2,1..240] of char=(
   'Prefix=%GlobalP','refix%'#010+
   #010+
   '[IncludeFiles]'#010+
-  'FileMask=%CompilerConfigDir%/conf.d/*.conf'#010+
+  'FileMask=%CompilerConfigDir%conf.d/*.conf'#010+
   #010+
   '[Repository]'#010+
   'Name=user'#010+
   'Description=User-installed packages'#010+
-  'Path={LocalRepository}lib/fpc/{CompilerVersion}/'#010+
+  'Path={LocalRepository}%UserPathSuffix%'#010+
   'Prefix={LocalRepository}'#010
 );