diff --git a/dbus/org.dharkael.Flameshot.xml b/dbus/org.dharkael.Flameshot.xml
index 5bfd1b6a..57b899a3 100644
--- a/dbus/org.dharkael.Flameshot.xml
+++ b/dbus/org.dharkael.Flameshot.xml
@@ -53,6 +53,17 @@
       <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
     </method>
 
+    <!--
+        autostartEnabled:
+        @enabled: The new state fot the autostart.
+
+        Enable or disable the autostart of the program.
+    -->
+    <method name="autostartEnabled">
+      <arg name="enabled" type="b" direction="in"/>
+      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
+    </method>
+
     <!--
         captureTaken:
         @id: identificator of the call.
diff --git a/src/core/flameshotdbusadapter.cpp b/src/core/flameshotdbusadapter.cpp
index 8e4afae6..682d0356 100644
--- a/src/core/flameshotdbusadapter.cpp
+++ b/src/core/flameshotdbusadapter.cpp
@@ -85,3 +85,10 @@ void FlameshotDBusAdapter::trayIconEnabled(bool enabled) {
         controller->disableTrayIcon();
     }
 }
+
+void FlameshotDBusAdapter::autostartEnabled(bool enabled) {
+    ConfigHandler().setStartupLaunch(enabled);
+    auto controller =  Controller::getInstance();
+    // Autostart is not saved in a .ini file, requires manual update
+    controller->updateConfigComponents();
+}
diff --git a/src/core/flameshotdbusadapter.h b/src/core/flameshotdbusadapter.h
index 0730c6bf..9f5cdb5b 100644
--- a/src/core/flameshotdbusadapter.h
+++ b/src/core/flameshotdbusadapter.h
@@ -37,4 +37,5 @@ public slots:
     Q_NOREPLY void fullScreen(QString path, bool toClipboard, int delay, uint id);
     Q_NOREPLY void openConfig();
     Q_NOREPLY void trayIconEnabled(bool enabled);
+    Q_NOREPLY void autostartEnabled(bool enabled);
 };
diff --git a/src/main.cpp b/src/main.cpp
index b0bb2482..ae86065b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -117,6 +117,10 @@ int main(int argc, char *argv[]) {
                 {"t", "trayicon"},
                 "Enable or disable the trayicon",
                 "bool");
+    CommandOption autostartOption(
+                {"a", "autostart"},
+                "Enable or disable run at startup",
+                "bool");
     CommandOption showHelpOption(
                 {"s", "showhelp"},
                 "Show the help message in the capture mode",
@@ -171,6 +175,7 @@ int main(int argc, char *argv[]) {
     delayOption.addChecker(delayChecker, delayErr);
     pathOption.addChecker(pathChecker, pathErr);
     trayOption.addChecker(booleanChecker, booleanErr);
+    autostartOption.addChecker(booleanChecker, booleanErr);
     showHelpOption.addChecker(booleanChecker, booleanErr);
 
     // Relationships
@@ -182,8 +187,9 @@ int main(int argc, char *argv[]) {
     parser.AddOptions({ pathOption, delayOption, rawImageOption }, guiArgument);
     parser.AddOptions({ pathOption, clipboardOption, delayOption, rawImageOption },
                       fullArgument);
-    parser.AddOptions({ filenameOption, trayOption, showHelpOption,
-                        mainColorOption, contrastColorOption }, configArgument);
+    parser.AddOptions({ autostartOption, filenameOption, trayOption,
+                        showHelpOption, mainColorOption, contrastColorOption },
+                      configArgument);
     // Parse
     if (!parser.parse(app.arguments())) {
         goto finish;
@@ -273,6 +279,7 @@ int main(int argc, char *argv[]) {
         }
     }
     else if (parser.isSet(configArgument)) { // CONFIG
+        bool autostart = parser.isSet(autostartOption);
         bool filename = parser.isSet(filenameOption);
         bool tray = parser.isSet(trayOption);
         bool help = parser.isSet(showHelpOption);
@@ -281,6 +288,21 @@ int main(int argc, char *argv[]) {
         bool someFlagSet = (filename || tray || help ||
                             mainColor || contrastColor);
         ConfigHandler config;
+        if (autostart) {
+            QDBusMessage m = QDBusMessage::createMethodCall("org.dharkael.Flameshot",
+                                               "/", "", "autostartEnabled");
+            if (parser.value(autostartOption) == "false") {
+                m << false;
+            } else if (parser.value(autostartOption) == "true") {
+                m << true;
+            }
+            QDBusConnection sessionBus = QDBusConnection::sessionBus();
+            if (!sessionBus.isConnected()) {
+                SystemNotification().sendMessage(
+                            QObject::tr("Unable to connect via DBus"));
+            }
+            sessionBus.call(m);
+        }
         if (filename) {
             QString newFilename(parser.value(filenameOption));
             config.setFilenamePattern(newFilename);