diff --git a/conf/sysinit b/conf/init.syncthing
similarity index 100%
rename from conf/sysinit
rename to conf/init.syncthing
diff --git a/scripts/install b/scripts/install
index 29b7870..3755bd3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -60,7 +60,8 @@ sed -i "s@GUIADDRESSTOCHANGE@$GUIADDRESS@g" ../conf/sysinit
 sudo cp ../conf/sysinit /etc/init.d/syncthing
 sudo chmod 0755 /etc/init.d/syncthing
 sudo update-rc.d syncthing defaults
-sudo yunohost service add -l /var/log/syncthing.log syncthing
+#~ sudo yunohost service add -l /var/log/syncthing.log syncthing
+sudo yunohost service add syncthing
 sudo service syncthing start
 
 # Configure logrotate if present
diff --git a/scripts/remove b/scripts/remove
index d0af13d..cea831a 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -11,7 +11,9 @@ sudo update-rc.d -f syncthing remove
 sudo rm -f /etc/init.d/syncthing
 
 # Remove syncthing binairy
-sudo apt-get remove syncthing
+sudo apt-get autoremove syncthing -y
+sudo rm /etc/apt/sources.list.d/syncthing-release.list
+sudo apt-get update
 
 # Backup syncthign SYNCHOME directory
 sudo mv $SYNCHOME $SYNCHOME.old