diff --git a/git/toolkit/components/remote/nsQtRemoteService.cpp b/git/toolkit/components/remote/nsQtRemoteService.cpp
index 587faa888fb6e..d01e7d2b2335b 100644
--- a/git/toolkit/components/remote/nsQtRemoteService.cpp
+++ b/git/toolkit/components/remote/nsQtRemoteService.cpp
@@ -100,6 +100,9 @@ mServerWindow(0)
 NS_IMETHODIMP
 nsQtRemoteService::Startup(const char* aAppName, const char* aProfileName)
 {
+#if (MOZ_PLATFORM_MAEMO == 5)
+  return NS_ERROR_NOT_IMPLEMENTED;
+#endif
   if (mServerWindow) return NS_ERROR_ALREADY_INITIALIZED;
   NS_ASSERTION(aAppName, "Don't pass a null appname!");
 
diff --git a/hg/toolkit/components/remote/nsQtRemoteService.cpp b/hg/toolkit/components/remote/nsQtRemoteService.cpp
index 15016f17c053f..9e4e1a78cfa2d 160000
--- a/hg/toolkit/components/remote/nsQtRemoteService.cpp
+++ b/hg/toolkit/components/remote/nsQtRemoteService.cpp
@@ -1 +1 @@
-Subproject commit 15016f17c053f14e5bdcb9108f25a06c133df561
+Subproject commit 9e4e1a78cfa2d67822e7ac77e80b811ff1803990