diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
index e4ed46b..c430391 100644
--- a/net-p2p/resilio-sync/Manifest
+++ b/net-p2p/resilio-sync/Manifest
@@ -1,6 +1,6 @@
-AUX confd 317 SHA256 27932ee892b937fa92d6c28f22e90893eaf86bc023a86ff3e36fcabca8c85fa0 SHA512 b3b7a589df573bacbf80c4b08f6b23638afdb8e7d8c7d1935fa630ae12e908fa014e9334f009a46c878132b1f156f26ef6dcc356bd46750805e43de29f264e90 WHIRLPOOL 216db51b0399da58ddd5642fc9dcf5d67894d54b953c62fbdf4cb2de1b3660c30897044ea36dd6c3346d6218f0e8364d2ad2815713032402fad5390e635b75c5
-AUX initd 798 SHA256 80179246a2b12f304ee8c1d4f280adf9cd4df9015dc3407db98774a4a1eae90e SHA512 a6dfe7299f80894996e2e07e1b5ead0027aea7628f292564a48160621f503b6ace957906a17f12eb53de975b8b3e6ef61736a81b1fba6bcd3eaa30f1f2aec886 WHIRLPOOL ccd5325f88f3b328a5113b07373078b7698ee4a1278a181b193a1fc2e664f073de76ff6148806232dd53dc4baa5c715eb77cc30ba67ac97feb0b6ac3766164dd
+AUX confd 335 SHA256 3ae3b164df2234cceef30263750c8de1091eb5197ae9072ca485ff242bfb68c2 SHA512 39c616821ad8f43d7fa992bf68dbdc8f6ff315c15f4ed4f6ea73f49d0eb8b0aa39cf5a14ed633ab879df793431afefcd17d4c4def8592bf69bc114073653e8d8 WHIRLPOOL a29ee29c8b8e840c5ceff0f8d4fb968fa05a93d7947e278e58c58d8ef9f0b5071d7aff8695698792e2d42a6071d8db7dd47a0ec30ad0e1322cf54034f8f4d7c6
+AUX initd 794 SHA256 3f76fa62c6eea8ab44744c652bbdc51761fa599b6b9ec98723a4125603652dfe SHA512 0ade9ede1819b5c3cfd47d7ccab1296743b281fde63f566e44f439cc670048b055ecb898f115462f59a0b07b348772266967e852692589bb6e758d40df172db1 WHIRLPOOL 3c98b6607f0399d35506f98781bf0dfc77fcd4b935b76fad6c16c8bb9b52aad707b3aa8efc9bbe8cabd8041ed72d4d5b19a242366435123c8c5aa49625502281
 DIST resilio-sync_arm-2.4.4.tar.gz 10043416 SHA256 3a36576962f93bcefc05842f2cc7303af8a826ecb596abed4a953a7be5595532 SHA512 65be4d757c91cd0cba89aaef9372bbac49d8c01215529d7d9b90edfa0600317739abd849ca253702cb6d78a55e33772531c2e587e0da673d7963b50f784ece5c WHIRLPOOL 2e1039a6e53ac9838a937dc6ceb744e68becb576f683f553c1826d584a124349d9e77294344276f04d19a534c8aa1a3d62b2617cb02165de3c5f8b128fb59649
 DIST resilio-sync_i386-2.4.4.tar.gz 10542059 SHA256 77a2b6e6c07526ad29426dcae4e5b84babd50d5d24aa3b0d93a3b3d2b5ce91d9 SHA512 32d951f4c73570e687e95888b3116083bb48f751b93db57fbe3f5b111d18a58a6a78942793395271b15585f844401d45c103c7a3f501d289460e3f03d571622e WHIRLPOOL 09d7222021c96855d307d1dc865f0badbb37c908d3a9d3885ae2971dfbb9261d75bb44d094fefaeaaa29e78a4ed37500bb73130120559a379d74eacbc564683f
 DIST resilio-sync_x64-2.4.4.tar.gz 10721240 SHA256 00fb4354b713cda91a55a9e84fe4a9be5241f42b5b7b6a6df52f72ea89f1c447 SHA512 a1bece19e322eba3cdba1744b5f6a78ee25d97e2bb7c3295d4c4583d45da962bfc13788dbba44018a21781b4824f85f50a4d1551ec9861ac6d2bac0dfd2a1ae6 WHIRLPOOL e0f77351ade7abf419e93c314a8edbd821e1e1092e7ec718f3c22c8745024fa33afdd6212815999499260bff1827ffa4c9e6b67bf3557b62a8f426ee23619308
-EBUILD resilio-sync-2.4.4.ebuild 1972 SHA256 99b90161e9c00143383b9e9daff699ddc04342bc9f361e0d9b3bdbb2e1f9390f SHA512 de82490d52c68ab2710459264ea13b7a327f6cbe3690e02e1ac45d3b7bef0e8938ed906be9a94debd9a3c5d2e45fee879573277cf23ca02acaa03b668c526b20 WHIRLPOOL e3397ab58bb30906d21637e9f62271c269201096d03b3007a3de1ea839322633a6a1c95aa1ed0fe69c1ed0a622aa6aefe40f93c109af93b755a91c6c4c0a91c8
+EBUILD resilio-sync-2.4.4-r1.ebuild 2010 SHA256 67735f12a13de23e73dafe7633469b8f7b621e53d819400c9db1f1de4b696033 SHA512 4eb9edbbcc89fdd8c329209e710d332dfc5c0ae66e981d55985be99bf00b693cf461c993652a038d3d4c6d02506682f647e7db8921ba2d1aa92d8410a813b1d3 WHIRLPOOL a0a2d1e38653492b5a4dbdaadca803ae93cf5d7a3c0ac0951e8787b4a4b2a4f9a9467776b493384d3c22d30b216a2ad550e4913dca8d8d77288486b685ed5e7d
diff --git a/net-p2p/resilio-sync/files/confd b/net-p2p/resilio-sync/files/confd
index 5e6a242..d7e7ac7 100644
--- a/net-p2p/resilio-sync/files/confd
+++ b/net-p2p/resilio-sync/files/confd
@@ -4,9 +4,9 @@
 SYNC_USER="rslsync"
 SYNC_GROUP="rslsync"
 
-NAME="BitTorrent Sync"
+NAME="Resilio Sync"
 SYNC_NAME="rslsync"
-SYNC_PATH="/opt/resilio-sync/"
+SYNC_PATH="/opt/resilio-sync"
 SYNC_BINARY="${SYNC_PATH}/${SYNC_NAME}"
-SYNC_OPTS="--config /etc/ilio-sync/config"
-SYNC_PIDFILE="/var/run/resilio-sync/${SYNC_NAME}.pid"
+SYNC_OPTS="--config /etc/resilio-sync/config --storage /var/rslsync"
+SYNC_PIDFILE="/run/resilio-sync/${SYNC_NAME}.pid"
diff --git a/net-p2p/resilio-sync/files/initd b/net-p2p/resilio-sync/files/initd
index 041fb30..5fd961f 100644
--- a/net-p2p/resilio-sync/files/initd
+++ b/net-p2p/resilio-sync/files/initd
@@ -31,8 +31,8 @@ stop() {
 
 	start-stop-daemon \
 	   --stop \
-	   --user "${BTSYNC_USER}" \
-	   --group "${BTSYNC_GROUP}" \
+	   --user "${SYNC_USER}" \
+	   --group "${SYNC_GROUP}" \
 	   --exec "${SYNC_BINARY}" \
 	   --wait 5000 \
 	   --retry SIGTERM/5 
diff --git a/net-p2p/resilio-sync/resilio-sync-2.4.4.ebuild b/net-p2p/resilio-sync/resilio-sync-2.4.4-r1.ebuild
similarity index 94%
rename from net-p2p/resilio-sync/resilio-sync-2.4.4.ebuild
rename to net-p2p/resilio-sync/resilio-sync-2.4.4-r1.ebuild
index 2844a0f..0a09412 100644
--- a/net-p2p/resilio-sync/resilio-sync-2.4.4.ebuild
+++ b/net-p2p/resilio-sync/resilio-sync-2.4.4-r1.ebuild
@@ -47,13 +47,13 @@ src_install() {
 	einfo dodir "/etc/${PN}"
 	dodir "/etc/${PN}"
 	"${D}/opt/${PN}/${NAME}" --dump-sample-config > "${D}/etc/${PN}/config"
-	sed -i 's|// "pid_file"|   "pid_file"|' "${D}/etc/${PN}/config"
 	fowners ${NAME} "/etc/${PN}/config"
 	fperms 460 "/etc/${PN}/config"
 }
 
 pkg_preinst() {
 	# Customize for local machine
+	sed -i 's|// "pid_file".*$|   "pid_file" : "/run/resilio-sync/rslsync.pid",|' "${D}/etc/${PN}/config"
 	# Set device name to `hostname`
 	sed -i "s/My Sync Device/$(hostname) Gentoo Linux/"  "${D}/etc/${PN}/config"
 	# Update defaults to the ${NAME}'s home dir