diff --git a/compiler/systems/t_aix.pas b/compiler/systems/t_aix.pas
index 060ef0841e..85cd009b6c 100644
--- a/compiler/systems/t_aix.pas
+++ b/compiler/systems/t_aix.pas
@@ -163,7 +163,7 @@ begin
       while assigned(HPath) do
        begin
          if assumebinutils then
-           Add('SEARCH_DIR('+maybequoted(HPath.Str)+')')
+           Add('SEARCH_DIR("'+HPath.Str+'")')
          else
            Add('-L'+HPath.Str);
          HPath:=TCmdStrListItem(HPath.Next);
@@ -172,7 +172,7 @@ begin
       while assigned(HPath) do
        begin
          if assumebinutils then
-           Add('SEARCH_DIR('+maybequoted(HPath.Str)+')')
+           Add('SEARCH_DIR("'+HPath.Str+'")')
          else
            Add('-L'+HPath.Str);
          HPath:=TCmdStrListItem(HPath.Next);
diff --git a/compiler/systems/t_amiga.pas b/compiler/systems/t_amiga.pas
index 6c34543ada..cc6980238e 100644
--- a/compiler/systems/t_amiga.pas
+++ b/compiler/systems/t_amiga.pas
@@ -118,7 +118,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+Unix2AmigaPath(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+Unix2AmigaPath(s)+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_bsd.pas b/compiler/systems/t_bsd.pas
index 8a756be531..9fe28c69c0 100644
--- a/compiler/systems/t_bsd.pas
+++ b/compiler/systems/t_bsd.pas
@@ -424,7 +424,7 @@ begin
      if LdSupportsNoResponseFile then
        LinkRes.Add('-L'+HPath.Str)
      else
-       LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+       LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
   HPath:=TCmdStrListItem(LibrarySearchPath.First);
@@ -433,7 +433,7 @@ begin
      if LdSupportsNoResponseFile then
        LinkRes.Add('-L'+HPath.Str)
      else
-       LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+       LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_embed.pas b/compiler/systems/t_embed.pas
index 95dce63b53..07a857ec5f 100644
--- a/compiler/systems/t_embed.pas
+++ b/compiler/systems/t_embed.pas
@@ -113,7 +113,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_gba.pas b/compiler/systems/t_gba.pas
index 72a768cfae..ac81d4bbee 100644
--- a/compiler/systems/t_gba.pas
+++ b/compiler/systems/t_gba.pas
@@ -107,7 +107,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas
index 95844bd8f2..60f0a91365 100644
--- a/compiler/systems/t_linux.pas
+++ b/compiler/systems/t_linux.pas
@@ -353,13 +353,13 @@ begin
       HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
       while assigned(HPath) do
        begin
-         Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+         Add('SEARCH_DIR("'+HPath.Str+'")');
          HPath:=TCmdStrListItem(HPath.Next);
        end;
       HPath:=TCmdStrListItem(LibrarySearchPath.First);
       while assigned(HPath) do
        begin
-         Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+         Add('SEARCH_DIR("'+HPath.Str+'")');
          HPath:=TCmdStrListItem(HPath.Next);
        end;
 
diff --git a/compiler/systems/t_morph.pas b/compiler/systems/t_morph.pas
index cf3bfa11db..7a13206343 100644
--- a/compiler/systems/t_morph.pas
+++ b/compiler/systems/t_morph.pas
@@ -104,7 +104,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+Unix2AmigaPath(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+Unix2AmigaPath(s)+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_nds.pas b/compiler/systems/t_nds.pas
index fe79a46ae9..dcf18ab20e 100644
--- a/compiler/systems/t_nds.pas
+++ b/compiler/systems/t_nds.pas
@@ -122,7 +122,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_sunos.pas b/compiler/systems/t_sunos.pas
index df425572f9..fcf613c604 100644
--- a/compiler/systems/t_sunos.pas
+++ b/compiler/systems/t_sunos.pas
@@ -224,13 +224,13 @@ begin
   HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
   while assigned(HPath) do
    begin
-     LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+     LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
   HPath:=TCmdStrListItem(LibrarySearchPath.First);
   while assigned(HPath) do
    begin
-     LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+     LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_wii.pas b/compiler/systems/t_wii.pas
index 2f97e40153..837df26d7c 100644
--- a/compiler/systems/t_wii.pas
+++ b/compiler/systems/t_wii.pas
@@ -99,7 +99,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 
diff --git a/compiler/systems/t_win.pas b/compiler/systems/t_win.pas
index 91b612f7bb..c253201d81 100644
--- a/compiler/systems/t_win.pas
+++ b/compiler/systems/t_win.pas
@@ -1200,13 +1200,13 @@ implementation
             HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
             while assigned(HPath) do
              begin
-               Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
+               Add('SEARCH_DIR("'+HPath.Str+'")');
                HPath:=TCmdStrListItem(HPath.Next);
              end;
             HPath:=TCmdStrListItem(LibrarySearchPath.First);
             while assigned(HPath) do
              begin
-               Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
+               Add('SEARCH_DIR("'+HPath.Str+'")');
                HPath:=TCmdStrListItem(HPath.Next);
              end;