diff --git a/config/connectionagent.service b/config/connectionagent.service
index 9be56d0..7fefe3c 100644
--- a/config/connectionagent.service
+++ b/config/connectionagent.service
@@ -1,11 +1,11 @@
 [Unit]
 Description=Connection Agent
-Requires=dbus.service
-After=pre-user-session.target
+Requires=dbus.service booster-qt5.service
+After=pre-user-session.target booster-qt5.service
 
 [Service]
 EnvironmentFile=-/etc/tracing/connectionagent/connectionagent.tracing
-ExecStart=/usr/bin/connectionagent $TRACING
+ExecStart=/usr/bin/invoker -o --type=qt5 /usr/bin/connectionagent $TRACING
 Type=dbus
 BusName=com.jolla.Connectiond
 Restart=always
diff --git a/connd/connd.pro b/connd/connd.pro
index daa8937..ef5cc33 100644
--- a/connd/connd.pro
+++ b/connd/connd.pro
@@ -4,6 +4,13 @@ QT = core network dbus
 TARGET = connectionagent
 PKGCONFIG += connman-qt5 qofono-qt5
 
+packagesExist(qt5-boostable) {
+    DEFINES += HAS_BOOSTER
+    PKGCONFIG += qt5-boostable
+} else {
+    warning("qt5-boostable not available; startup times will be slower")
+}
+
 CONFIG   += console link_pkgconfig
 CONFIG   -= app_bundle
 
diff --git a/connd/main.cpp b/connd/main.cpp
index eb67b81..f5a0f03 100644
--- a/connd/main.cpp
+++ b/connd/main.cpp
@@ -87,7 +87,7 @@ void messageOutput(QtMsgType type, const QMessageLogContext &context, const QStr
         previousMessageHandler(type,context,str);
  }
 
-int main(int argc, char *argv[])
+Q_DECL_EXPORT int main(int argc, char *argv[])
 {
     previousMessageHandler = qInstallMessageHandler(messageOutput);
 
diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
index 62a6a86..06bdfbf 100644
--- a/rpm/connectionagent-qt5.spec
+++ b/rpm/connectionagent-qt5.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(qofono-qt5)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(qt5-boostable)
 Provides:   connectionagent > 0.10.1
 Obsoletes:   connectionagent <= 0.7.6