diff --git a/net-p2p/btsync/ChangeLog b/net-p2p/btsync/ChangeLog
new file mode 100644
index 0000000..62c9215
--- /dev/null
+++ b/net-p2p/btsync/ChangeLog
@@ -0,0 +1,3 @@
+  13 Jan 2016;  <chymera@gentoo.org> +files/btsync.conf, +files/init.d/btsync,
+  +files/systemd/btsync.service:
+  net-p2p/btsync: added config and service files from pigfoot
diff --git a/net-p2p/btsync/files/btsync.conf b/net-p2p/btsync/files/btsync.conf
new file mode 100644
index 0000000..6a4a5a9
--- /dev/null
+++ b/net-p2p/btsync/files/btsync.conf
@@ -0,0 +1,20 @@
+{
+  "device_name": "Gentoo",
+  "listening_port" : 0,
+  
+  "storage_path" : "/var/lib/btsync",
+  "pid_file" : "/var/run/btsync/btsync.pid",
+
+  "check_for_updates" : true, 
+  "use_upnp" : true,
+
+  "download_limit" : 0,                       
+  "upload_limit" : 0, 
+
+  "webui" :
+  {
+    "listen" : "127.0.0.1:8888",
+    "login" : "admin",
+    "password" : "admin"
+  }
+}
diff --git a/net-p2p/btsync/files/init.d/btsync b/net-p2p/btsync/files/init.d/btsync
new file mode 100644
index 0000000..9e7cd3d
--- /dev/null
+++ b/net-p2p/btsync/files/init.d/btsync
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+
+# Copyright 2013-2014 Jonathan Vasquez <jvasquez1011@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+NAME="BitTorrent Sync"
+SYNC_NAME="btsync"
+SYNC_PATH="/opt/${SYNC_NAME}/"
+SYNC_BINARY="${SYNC_PATH}/${SYNC_NAME}"
+SYNC_OPTS="--nodaemon --config /etc/${SYNC_NAME}/btsync.conf"
+SYNC_PIDFILE="/var/run/${SYNC_NAME}/${SYNC_NAME}.pid"
+SYNC_USER=${SYNC_USER:-btsync}
+SYNC_GROUP=${SYNC_GROUP:-btsync}
+
+start() {
+	ebegin "Starting ${NAME}"
+
+	# Sets the umask for the process so that btsync creates files
+	# with group write permissions
+	start-stop-daemon --start --exec "${SYNC_BINARY}" \
+	   --pidfile "${SYNC_PIDFILE}" --background \
+	   --user "${SYNC_USER}" --group "${SYNC_GROUP}" \
+	   -- ${SYNC_OPTS}
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${NAME}"
+
+	start-stop-daemon --stop --exec "${SYNC_BINARY}" \
+	    --pidfile "${SYNC_PIDFILE}"
+
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${NAME}"
+
+	start-stop-daemon --signal HUP --exec "${SYNC_BINARY}" \
+	    --pidfile "${SYNC_PIDFILE}"
+
+	eend $?
+}
diff --git a/net-p2p/btsync/files/systemd/btsync.service b/net-p2p/btsync/files/systemd/btsync.service
new file mode 100644
index 0000000..09554e6
--- /dev/null
+++ b/net-p2p/btsync/files/systemd/btsync.service
@@ -0,0 +1,14 @@
+# Copyright 2014-2016 Jonathan Vasquez <jvasquez1011@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+[Unit]
+Description=BitTorrent Sync
+After=systemd-udev-settle.target local-fs.target zfs.service
+
+[Service]
+Type=forking
+ExecStart=/opt/btsync/btsync --config /etc/btsync/config
+
+[Install]
+WantedBy=multi-user.target
+