diff --git a/net-p2p/btsync/Makefile b/net-p2p/btsync/Makefile
index 809e0e6fe38b..d02c7944f137 100644
--- a/net-p2p/btsync/Makefile
+++ b/net-p2p/btsync/Makefile
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	btsync
-PORTVERSION=	1.4.93
+PORTVERSION=	1.4.103
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://syncapp.bittorrent.com/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_freebsd_${CONFIG_ARCH}-${PORTVERSION}
 
 MAINTAINER=	joshruehlig@gmail.com
 COMMENT=	Distributed peer-to-peer file syncing application
 
 LICENSE=	EULA
 LICENSE_NAME=	BitTorrent Sync
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 LICENSE_PERMS=	auto-accept
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	It is a binary-only program. Source code not available.
 
 PLIST_SUB=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS}
 SUB_LIST=	PORTNAME=${PORTNAME} USER=${USERS} GROUP=${GROUPS}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CONFIG_ARCH=	x64
 .else
 CONFIG_ARCH=	${ARCH}
 .endif
 
 post-extract:
 	${MKDIR} ${WRKSRC}/temp
 	${MV} ${WRKSRC}/${PORTNAME} ${WRKSRC}/temp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/temp/btsync ${STAGEDIR}${PREFIX}/bin
 	${WRKSRC}/temp/btsync --dump-sample-config > ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
-	${REINPLACE_CMD} -e 's;^//\( *"storage_path" *: *\)"/.*",;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
-	${REINPLACE_CMD} -e 's;^//\( *"pid_file" *: *"/var/run/${PORTNAME}/${PORTNAME}.pid",\);\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${REINPLACE_CMD} -e 's;^//\([[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*\)"/.*",$$;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
+	${REINPLACE_CMD} -e 's;^//\([[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*"/var/run/${PORTNAME}/${PORTNAME}.pid",\)$$;\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
-post-install:
+post-stage:
 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/btsync/distinfo b/net-p2p/btsync/distinfo
index bc4e950d744e..834ab314c59c 100644
--- a/net-p2p/btsync/distinfo
+++ b/net-p2p/btsync/distinfo
@@ -1,4 +1,4 @@
-SHA256 (btsync_freebsd_i386-1.4.93.tar.gz) = 0cb5459299325285644e063d4878ad7d9ed828e9b679537e270d22ce8a58527d
-SIZE (btsync_freebsd_i386-1.4.93.tar.gz) = 3593610
-SHA256 (btsync_freebsd_x64-1.4.93.tar.gz) = 8e1da143c9e3849264301fab6dee1978f3b8644dff49e958a56f7d81fdaa3494
-SIZE (btsync_freebsd_x64-1.4.93.tar.gz) = 3737221
+SHA256 (btsync_freebsd_i386-1.4.93.tar.gz) = b3413bd2b93df929ecf8bd71ee88b049efa27cf6d6a47d2e683536aa850ed4b8
+SIZE (btsync_freebsd_i386-1.4.93.tar.gz) = 3603220
+SHA256 (btsync_freebsd_x64-1.4.103.tar.gz) = 9991256af165f2afd09819d18a186e13c9b325df090bb562367e564633860ce7
+SIZE (btsync_freebsd_x64-1.4.103.tar.gz) = 3744913
diff --git a/net-p2p/btsync/files/btsync.in b/net-p2p/btsync/files/btsync.in
index 66c62d6eb629..7c871fc44786 100644
--- a/net-p2p/btsync/files/btsync.in
+++ b/net-p2p/btsync/files/btsync.in
@@ -1,42 +1,43 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: %%PORTNAME%%
-# REQUIRE: NETWORKING SERVERS DAEMON ldconfig resolv
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # %%PORTNAME%%_enable (bool):   Set to NO by default.
 #                               Set it to YES to enable it.
 # %%PORTNAME%%_user:            The user account %%PORTNAME%% daemon runs as
 #                               what you want it to be. It uses '%%USER%%'
 #                               user by default. Do not sets it as empty or it
 #                               will run as root.
 # %%PORTNAME%%_group:           The group account %%PORTNAME%% daemon runs as
 #                               what you want it to be. It uses '%%GROUP%%'
 #                               group by default. Do not sets it as empty or it
 #                               will run as wheel.
 
 . /etc/rc.subr
 name="%%PORTNAME%%"
 rcvar="${name}_enable"
 load_rc_config $name
 
 : ${%%PORTNAME%%_enable:="NO"}
 : ${%%PORTNAME%%_user:="%%USER%%"}
 : ${%%PORTNAME%%_group:="%%GROUP%%"}
 
 pidfile="/var/run/%%PORTNAME%%/%%PORTNAME%%.pid"
 command="%%PREFIX%%/bin/btsync"
 command_args="--config %%PREFIX%%/etc/%%PORTNAME%%.conf"
 
 start_precmd=%%PORTNAME%%_prestart
-%%PORTNAME%%_prestart(){
+%%PORTNAME%%_prestart() {
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o $%%PORTNAME%%_user -g $%%PORTNAME%%_group ${pidfile%/*}
 	fi
 }
 
 run_rc_command "$1"
diff --git a/net-p2p/btsync/files/pkg-message.in b/net-p2p/btsync/files/pkg-message.in
index d232ca4f340f..6228b28fb678 100644
--- a/net-p2p/btsync/files/pkg-message.in
+++ b/net-p2p/btsync/files/pkg-message.in
@@ -1,15 +1,15 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 net-p2p/%%PORTNAME%% includes an RC script:
 %%PREFIX%%/etc/rc.d/%%PORTNAME%%
 
-TO START BTSYNC ON BOOT:
-echo 'btsync_enable="YES"' >> /etc/rc.conf
+TO START ON BOOT:
+# echo '%%PORTNAME%%_enable="YES"' >> /etc/rc.conf
 
 START MANUALLY:
-%%PREFIX%%/etc/rc.d/%%PORTNAME%% start
+# service %%PORTNAME%% start
 
 Once started, visit the following to configure:
 http://localhost:8888/
 
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *