diff --git a/reactos/lib/syssetup/install.c b/reactos/lib/syssetup/install.c
index 6e96608e427..a3ab01cb177 100644
--- a/reactos/lib/syssetup/install.c
+++ b/reactos/lib/syssetup/install.c
@@ -34,6 +34,7 @@
 
 #include <commctrl.h>
 #include <stdio.h>
+#include <io.h>
 #include <tchar.h>
 #include <stdlib.h>
 
@@ -446,8 +447,13 @@ InstallReactOS (HINSTANCE hInstance)
     CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT);
   }
   
-  /* create Games subfolder */
-  CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256);  
+  /* create Games subfolder and fill if the exe is available */
+  if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) {
+	/* Check for existence */
+   	if( (_access( "c:\\reactos\\system32\\sol.exe", 0 )) != -1 )
+      CreateShortcut(CSIDL_PROGRAMS, sGames, _T("Solitaire.lnk"), _T("sol.exe"), IDS_CMT_SOLITAIRE);
+
+  }
 
   CoUninitialize();
 
diff --git a/reactos/lib/syssetup/resource.h b/reactos/lib/syssetup/resource.h
index 110d6358d72..626a076f388 100644
--- a/reactos/lib/syssetup/resource.h
+++ b/reactos/lib/syssetup/resource.h
@@ -93,6 +93,7 @@
 #define IDS_CMT_WINEFILE		3212
 #define IDS_CMT_NOTEPAD			3213
 #define IDS_CMT_REGEDIT			3214
+#define IDS_CMT_SOLITAIRE		3215
 
 #define IDR_GPL				4000
 
diff --git a/reactos/lib/syssetup/syssetup_En.rc b/reactos/lib/syssetup/syssetup_En.rc
index 60ded1018f6..c633ec43bb2 100644
--- a/reactos/lib/syssetup/syssetup_En.rc
+++ b/reactos/lib/syssetup/syssetup_En.rc
@@ -207,6 +207,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_GAMES		    "Games"
+    IDS_CMT_SOLITAIRE	"Solitaire"
 END