diff --git a/checkin_notes b/checkin_notes
index f9600f2c00..01a602884c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8619,10 +8619,17 @@ David  10 Aug 2006
         client_state.h
         cs_apps.C
         cs_scheduler.C
+
 Milos  10 Aug 2006
     - Updated Simple GUI code to reflect new design
     - Skins folder contains new images as well and also
       new skin.xml files
       
     clientgui/
-    	sg_*
\ No newline at end of file
+    	sg_*
+
+Walt   10 Aug 2006
+    - Remove taskbar icon on Linux so the manager exits properly
+      
+    clientgui/
+    	BOINCGUIApp.cpp
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 9c1e29cb88..02c6c0f0b5 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -460,13 +460,15 @@ bool CBOINCGUIApp::OnInit() {
 #endif
 
     // Initialize the task bar icon
-    m_pTaskBarIcon = new CTaskBarIcon(
+#if defined(__WXMSW__) || defined(__WXMAC__)
+	m_pTaskBarIcon = new CTaskBarIcon(
         m_pBranding->GetApplicationName(), 
         m_pBranding->GetApplicationIcon(),
         m_pBranding->GetApplicationDisconnectedIcon(),
         m_pBranding->GetApplicationSnoozeIcon()
     );
     wxASSERT(m_pTaskBarIcon);
+#endif
 
     // Detect the display info and store for later use.
     DetectDisplayInfo();
@@ -532,9 +534,12 @@ int CBOINCGUIApp::OnExit() {
     // Shutdown the System Idle Detection code
     ClientLibraryShutdown();
 
+#if defined(__WXMSW__) || defined(__WXMAC__)
     if (m_pTaskBarIcon) {
         delete m_pTaskBarIcon;
     }
+#endif
+
 #ifdef __WXMAC__
     if (m_pMacSystemMenu) {
         delete m_pMacSystemMenu;