diff --git a/lcl/include/sysenvapis_win.inc b/lcl/include/sysenvapis_win.inc
index 6a44bfc3f3..da896f2bb7 100644
--- a/lcl/include/sysenvapis_win.inc
+++ b/lcl/include/sysenvapis_win.inc
@@ -13,6 +13,12 @@ begin
   Result := False;
   if AURL = '' then Exit;
 
+  // A help for users which forget to properly encode their URLs
+  // See bug 21659 and see http://www.ietf.org/rfc/rfc1738.txt which says
+  // that spaces in URLs need to be encoded
+  if Pos(' ', AURL) > 0 then
+    AURL := StringReplace(AURL, ' ', '%20', [rfReplaceAll, rfIgnoreCase]);
+
   {$IFDEF WinCE}
   FillChar(Info, SizeOf(Info), 0);
   Info.cbSize := SizeOf(Info);
diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk
index 3eb1a8fac4..6f6c9ae7f3 100644
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
@@ -30,7 +30,7 @@
     <License Value="modified LGPL-2
 "/>
     <Version Major="1" Release="1"/>
-    <Files Count="288">
+    <Files Count="292">
       <Item1>
         <Filename Value="barchart.pp"/>
         <UnitName Value="BarChart"/>
@@ -1188,6 +1188,22 @@
         <Filename Value="customdrawn_android.pas"/>
         <UnitName Value="customdrawn_android"/>
       </Item288>
+      <Item289>
+        <Filename Value="include/sysenvapis_win.inc"/>
+        <Type Value="Include"/>
+      </Item289>
+      <Item290>
+        <Filename Value="include/sysenvapis.inc"/>
+        <Type Value="Include"/>
+      </Item290>
+      <Item291>
+        <Filename Value="include/sysenvapis_mac.inc"/>
+        <Type Value="Include"/>
+      </Item291>
+      <Item292>
+        <Filename Value="include/sysenvapis_unix.inc"/>
+        <Type Value="Include"/>
+      </Item292>
     </Files>
     <LazDoc Paths="../docs/xml/lcl"/>
     <i18n>