diff --git a/.gitmodules b/.gitmodules
index 888af8a..4b1a2fb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/AsteroidOS/libasteroid
 [submodule "asteroidsyncserviced/libwatchfish"]
 	path = asteroidsyncserviced/libwatchfish
-	url = https://git.javispedro.com/libwatchfish.git
+	url = git@github.com:piggz/libwatchfish.git
diff --git a/asteroidsyncservice/asteroidsyncservice.pro b/asteroidsyncservice/asteroidsyncservice.pro
index cc1e001..b449ba9 100644
--- a/asteroidsyncservice/asteroidsyncservice.pro
+++ b/asteroidsyncservice/asteroidsyncservice.pro
@@ -9,7 +9,7 @@ uri = org.asteroid.syncservice
 
 contains(CONFIG, telescope) {
     include(telescope.pri)
-} 
+}
 
 contains(CONFIG, starfish) {
     include(starfish.pri)
diff --git a/asteroidsyncservice/platforms/sailfishos/servicecontrol.h b/asteroidsyncservice/platforms/sailfishos/servicecontrol.h
index cda4918..438122b 100644
--- a/asteroidsyncservice/platforms/sailfishos/servicecontrol.h
+++ b/asteroidsyncservice/platforms/sailfishos/servicecontrol.h
@@ -23,7 +23,7 @@
 #include <QDBusInterface>
 #include <QObject>
 
-static const QString SYNCSERVICED_SYSTEMD_UNIT("asteroidsyncserviced.service");
+static const QString SYNCSERVICED_SYSTEMD_UNIT("harbour-asteroidsyncserviced.service");
 
 class ServiceControl : public QObject
 {
diff --git a/asteroidsyncserviced/asteroidsyncserviced.pro b/asteroidsyncserviced/asteroidsyncserviced.pro
index f5831cf..980899c 100644
--- a/asteroidsyncserviced/asteroidsyncserviced.pro
+++ b/asteroidsyncserviced/asteroidsyncserviced.pro
@@ -4,7 +4,13 @@ QT -= gui
 include(../version.pri)
 include(libasteroid/libasteroid.pri)
 
-TARGET = asteroidsyncserviced
+contains(CONFIG, telescope) {
+    TARGET = asteroidsyncserviced
+}
+
+contains(CONFIG, starfish) {
+    TARGET = harbour-asteroidsyncserviced
+}
 
 CONFIG += c++11
 CONFIG += console
diff --git a/asteroidsyncserviced/asteroidsyncserviced.service b/asteroidsyncserviced/harbour-asteroidsyncserviced.service
similarity index 77%
rename from asteroidsyncserviced/asteroidsyncserviced.service
rename to asteroidsyncserviced/harbour-asteroidsyncserviced.service
index ca596ac..0298f5c 100644
--- a/asteroidsyncserviced/asteroidsyncserviced.service
+++ b/asteroidsyncserviced/harbour-asteroidsyncserviced.service
@@ -4,7 +4,7 @@ Requires=dbus.socket bluetooth.target booster-qt5.service
 After=pre-user-session.target lipstick.service dbus.socket bluetooth.target booster-qt5.service
 
 [Service]
-ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/asteroidsyncserviced
+ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/harbour-asteroidsyncserviced
 Restart=always
 
 [Install]
diff --git a/asteroidsyncserviced/libwatchfish b/asteroidsyncserviced/libwatchfish
index e0752db..26f940b 160000
--- a/asteroidsyncserviced/libwatchfish
+++ b/asteroidsyncserviced/libwatchfish
@@ -1 +1 @@
-Subproject commit e0752dbbf32b5260ed7afc340eee8ac1049853fc
+Subproject commit 26f940bc9abf5cdd663a85a8a6c52533fa1d5a83
diff --git a/asteroidsyncserviced/starfish.pri b/asteroidsyncserviced/starfish.pri
index 6dcdfb1..70894bd 100644
--- a/asteroidsyncserviced/starfish.pri
+++ b/asteroidsyncserviced/starfish.pri
@@ -2,10 +2,13 @@ DEFINES += SAILFISHOS_PLATFORM
 
 WATCHFISH_FEATURES = notificationmonitor walltime music
 
-SUBDIRS += libwatchfish
+include(libwatchfish/libwatchfish.pri)
 
 PKGCONFIG += qt5-boostable
 
 SOURCES += platforms/sailfishos/sailfishplatform.cpp
 
 HEADERS += platforms/sailfishos/sailfishplatform.h
+
+DISTFILES += \
+    $$PWD/harbour-asteroidsyncserviced.service