diff --git a/README.md b/README.md
index b00102d..0ac1cdc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 KDE Connect Indicator
 =====================
 [![Translation Status](https://hosted.weblate.org/widgets/indicator-kde-connect/-/svg-badge.svg)](https://hosted.weblate.org/engage/indicator-kde-connect/?utm_source=widget)
-[![Build Status](https://travis-ci.org/Bajoja/indicator-kdeconnect.svg?branch=send-sms-dev)](https://travis-ci.org/Bajoja/indicator-kdeconnect)
+[![Build Status](https://travis-ci.org/Bajoja/indicator-kdeconnect.svg?branch=master)](https://travis-ci.org/Bajoja/indicator-kdeconnect)
 
 This Indicator is written to make [KDE Connect](https://community.kde.org/KDEConnect) usable in desktops without KDE Plasma, such as Ubuntu Unity and Pantheon.
 It started as an [AppIndicator](https://unity.ubuntu.com/projects/appindicators/), but you can send files and URLs easily through KDE Connect with kdeconnect-send.
diff --git a/rpm/indicator-kdeconnect.changes b/rpm/indicator-kdeconnect.changes
index 8f25508..27a45a6 100644
--- a/rpm/indicator-kdeconnect.changes
+++ b/rpm/indicator-kdeconnect.changes
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
---- -- -- --:--:-- UTC 2017 - pousaduarte@gmail.com
+Sat Apr 22 00:00:00 UTC 2017 - pousaduarte@gmail.com
 
 - Update to version 0.8.0:
   * Fix bug #51 - Nemo and Caja only show the first device
diff --git a/src/KDEConnectManager.vala b/src/KDEConnectManager.vala
index 53556c1..4b9938d 100644
--- a/src/KDEConnectManager.vala
+++ b/src/KDEConnectManager.vala
@@ -162,13 +162,14 @@ namespace KDEConnectIndicator {
         }
         
         private void run_kdeconnect_binary () {
-            //TODO: path depends from operating system, for now this will be the way to find it
+            var kdeconnect_path = GLib.Environment.get_system_config_dirs()[0]+
+            			  "/autostart/kdeconnectd.desktop";
+
             string std_out;
+
             try{
 		Process.spawn_sync (null,
-				    new string[]{"grep",
-				    "Exec",
-				    "/etc/xdg/autostart/kdeconnectd.desktop"},
+				    new string[]{"grep","Exec",kdeconnect_path},
 				    null,
 				    SpawnFlags.SEARCH_PATH,
 				    null,