Index: /trunk/src/VBox/Additions/x11/Installer/98vboxadd-xclient
===================================================================
--- /trunk/src/VBox/Additions/x11/Installer/98vboxadd-xclient	(revision 23940)
+++ /trunk/src/VBox/Additions/x11/Installer/98vboxadd-xclient	(revision 23941)
@@ -28,4 +28,5 @@
 
 /usr/bin/VBoxClient --clipboard
+/usr/bin/VBoxClient --checkhostversion
 /usr/bin/VBoxClient --display
 /usr/bin/VBoxClient --seamless
Index: /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 23940)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	(revision 23941)
@@ -61,10 +61,10 @@
 	seamless-x11.cpp \
 	thread.cpp \
-	display.cpp
+	display.cpp \
+	hostversion.cpp
  VBoxClient_LIBS += \
 	Xext Xmu
 endif
 ifdef VBOX_WITH_GUEST_PROPS
- VBoxClient_SOURCES += hostversion.cpp
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif
Index: /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp	(revision 23940)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp	(revision 23941)
@@ -45,5 +45,5 @@
     {
         int rc;
-#ifdef VBOX_WITH_DBUS
+# ifdef VBOX_WITH_DBUS
         DBusConnection *conn;
         DBusMessage* msg;
@@ -104,12 +104,12 @@
         if (msg != NULL)
             dbus_message_unref(msg);
-#else
+# else
         /* TODO: Implement me */
         rc = VINF_SUCCESS;
-#endif /* VBOX_WITH_DBUS */
+# endif /* VBOX_WITH_DBUS */
         return rc;
     }
 
-    /** @todo Move this part in VbglR3 and just provide a callback for the platform-specific 
+    /** @todo Move this part in VbglR3 and just provide a callback for the platform-specific
               notification stuff, since this is very similar to the VBoxTray code. */
     virtual int run()
@@ -117,15 +117,21 @@
         int rc;
         LogFlowFunc(("\n"));
-#ifdef VBOX_WITH_DBUS
+# ifdef VBOX_WITH_DBUS
         rc = RTDBusLoadLib();
         if (RT_FAILURE(rc))
+            LogRel(("VBoxClient: D-Bus seems not to be installed; no host version check/notification done.\n"));
+# else
+        rc = VERR_NOT_IMPLEMENTED;
+# endif /* VBOX_WITH_DBUS */
+
+# ifdef VBOX_WITH_GUEST_PROPS
+        if (RT_SUCCESS(rc))
         {
-            LogRel(("VBoxClient: D-Bus seems not to be installed; no host version check/notification done.\n"));
+            uint32_t uGuestPropSvcClientID;
+            rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+            if (RT_FAILURE(rc))
+                LogFlow(("Cannot connect to guest property service! rc = %Rrc\n", rc));
         }
-#else
-        rc = VERR_NOT_IMPLEMENTED;
-#endif
-        uint32_t uGuestPropSvcClientID;
-        rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+
         if (RT_SUCCESS(rc))
         {
@@ -143,5 +149,5 @@
                         char szMsg[256];
                         char szTitle[64];
-        
+
                         /** @todo add some translation macros here */
                         RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions update available!");
@@ -156,5 +162,5 @@
                     /* Store host version to not notify again */
                     rc = VbglR3HostVersionLastCheckedStore(uGuestPropSvcClientID, pszHostVersion);
-    
+
                     VbglR3GuestPropReadValueFree(pszHostVersion);
                     VbglR3GuestPropReadValueFree(pszGuestVersion);
@@ -163,4 +169,5 @@
             VbglR3GuestPropDisconnect(uGuestPropSvcClientID);
         }
+# endif /* VBOX_WITH_GUEST_PROPS */
         LogFlowFunc(("returning %Rrc\n", rc));
         return rc;
Index: /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp
===================================================================
--- /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 23940)
+++ /trunk/src/VBox/Additions/x11/VBoxClient/main.cpp	(revision 23941)
@@ -138,4 +138,7 @@
     RTPrintf("  --clipboard      start the shared clipboard service\n");
     RTPrintf("  --display     start the display management service\n");
+# ifdef VBOX_WITH_GUEST_PROPS
+    RTPrintf("  --checkhostversion      start the host version notifier service\n");
+# endif
     RTPrintf("  --seamless       start the seamless windows service\n");
     RTPrintf("  -d, --nodaemon   continue running as a system service\n");
@@ -190,5 +193,4 @@
                 fSuccess = false;
         }
-#ifdef VBOX_WITH_GUEST_PROPS
         else if (!strcmp(argv[i], "--checkhostversion"))
         {
@@ -198,5 +200,4 @@
                 fSuccess = false;
         }
-#endif
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
         {
@@ -223,7 +224,7 @@
             RTPrintf("VBoxClient: failed to daemonize.  Exiting.\n");
             Log(("VBoxClient: failed to daemonize.  Exiting.\n"));
-#ifdef DEBUG
+# ifdef DEBUG
             RTPrintf("Error %Rrc\n", rc);
-#endif
+# endif
             return 1;
         }