diff --git a/checkin_notes b/checkin_notes
index 0e8f15d3e6..4941d0022e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2029,3 +2029,10 @@ David  25 Feb 2009
     lib/
         parse.h
         proxy_info.cpp
+
+Rom    25 Feb 2009
+    - MGR: Remove the /s parameter from the argument list on Linux
+        until we know it is supported.  Fixes #615
+        
+    clientgui/
+        BOINCGUIApp.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 4ea48431fe..8f470bcdf5 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -514,7 +514,9 @@ void CBOINCGUIApp::OnInitCmdLine(wxCmdLineParser &parser) {
     wxApp::OnInitCmdLine(parser);
     static const wxCmdLineEntryDesc cmdLineDesc[] = {
         { wxCMD_LINE_SWITCH, wxT("a"), wxT("autostart"), _("BOINC Manager was started by the operating system automatically")},
+#if defined(__WXMSW__) || defined(__WXMAC__)
         { wxCMD_LINE_SWITCH, wxT("s"), wxT("systray"), _("Startup BOINC so only the system tray icon is visible")},
+#endif
         { wxCMD_LINE_SWITCH, wxT("b"), wxT("boincargs"), _("Startup BOINC with these optional arguments")},
         { wxCMD_LINE_SWITCH, wxT("i"), wxT("insecure"), _("disable BOINC security users and permissions")},
         { wxCMD_LINE_SWITCH, wxT("c"), wxT("checkskins"), _("set skin debugging mode to enable skin manager error messages")},