diff --git a/checkin_notes b/checkin_notes
index 8e46790b5a..fa221db30f 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12500,3 +12500,13 @@ David  30 Sept 2005
 
     client/
         gui_rpc_server_ops.C
+
+Rom    30 Sept 2005
+    - The system tray code wasn't closing down on some Linux distros which
+        was keeping the manager active without any way to shut it down. So
+        I'm disabling the system tray code for this release on Linux and
+        I'll look into fixing it in the next release cycle.
+        
+    clientgui/
+         BOINCGUIApp.cpp, .h
+         MainFrame.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 015152a7f6..5a5e4e9c1a 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -172,8 +172,10 @@ bool CBOINCGUIApp::OnInit() {
     wxASSERT(m_pFrame);
 
     // Initialize the task bar icon
+#if defined(__WXMSW__) || defined(__WXMAC__)
     m_pTaskBarIcon = new CTaskBarIcon();
     wxASSERT(m_pTaskBarIcon);
+#endif
 #ifdef __WXMAC__
     m_pMacSystemMenu = new CMacSystemMenu();
     wxASSERT(m_pMacSystemMenu);
@@ -238,9 +240,11 @@ int CBOINCGUIApp::OnExit() {
     // Shutdown the System Idle Detection code
     ShutdownSystemIdleDetection();
 
+#if defined(__WXMSW__) || defined(__WXMAC__)
     if (m_pTaskBarIcon) {
         delete m_pTaskBarIcon;
     }
+#endif
 #ifdef __WXMAC__
     if (m_pMacSystemMenu) {
         delete m_pMacSystemMenu;
diff --git a/clientgui/BOINCGUIApp.h b/clientgui/BOINCGUIApp.h
index 9a18dce212..a5b1c12c59 100644
--- a/clientgui/BOINCGUIApp.h
+++ b/clientgui/BOINCGUIApp.h
@@ -28,7 +28,7 @@
 #include "MainFrame.h"
 
 #include "BOINCTaskBar.h"   // Must be included before MainDocument.h
-#ifdef __APPLE__
+#ifdef __WXMAC__
 #include "mac/MacSysMenu.h"     // Must be included before MainDocument.h
 #endif
 
@@ -51,7 +51,7 @@ protected:
     bool            IsBOINCCoreRunning();
     void            StartupBOINCCore();
     void            ShutdownBOINCCore();
-#ifdef __APPLE__
+#ifdef __WXMAC__
     bool            ProcessExists(pid_t thePID);
 #endif
 
@@ -64,8 +64,10 @@ protected:
 
     CMainFrame*     m_pFrame;
     CMainDocument*  m_pDocument;
+#if defined(__WXMSW__) || defined(__WXMAC__)
     CTaskBarIcon*   m_pTaskBarIcon;
-#ifdef __APPLE__
+#endif
+#ifdef __WXMAC__
     CMacSystemMenu* m_pMacSystemMenu;
 #endif
 
@@ -95,8 +97,10 @@ public:
 
     CMainFrame*     GetFrame()                   { return m_pFrame; }
     CMainDocument*  GetDocument()                { return m_pDocument; }
+#if defined(__WXMSW__) || defined(__WXMAC__)
     CTaskBarIcon*   GetTaskBarIcon()             { return m_pTaskBarIcon; }
-#ifdef __APPLE__
+#endif
+#ifdef __WXMAC__
     CMacSystemMenu* GetMacSystemMenu()           { return m_pMacSystemMenu; }
 #endif
 
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index eb8ab82e47..1f19d35fee 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -1212,7 +1212,7 @@ void CMainFrame::OnHelpAbout(wxCommandEvent& WXUNUSED(event)) {
 void CMainFrame::OnClose(wxCloseEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnClose - Function Begin"));
 
-#ifdef wxHAS_TASK_BAR_ICON
+#if defined(__WXMSW__) || defined(__WXMAC__)
     if (!event.CanVeto()) {
         Destroy();
     } else {