diff --git a/comms/usbmuxd/Makefile b/comms/usbmuxd/Makefile
index 92e22795e166..bff38d002dee 100644
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	usbmuxd
 DISTVERSION=	1.1.1-58
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gbc0b91c
 CATEGORIES=	comms
 #MASTER_SITES=	https://github.com/libimobiledevice/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch
 WWW=		https://www.libimobiledevice.org
 
 LICENSE=		GPLv2 GPLv3
 LICENSE_COMB=		dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
 
 LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 		libimobiledevice-1.0.so:comms/libimobiledevice \
 		libimobiledevice-glue-1.0.so:comms/libimobiledevice-glue
 
 USES=		autoreconf cpe libtool localbase pathfix pkgconfig
 CPE_VENDOR=	nikias_bassen
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libimobiledevice
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-systemd
 
 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PLIST_FILES=	share/man/man8/${PORTNAME}.8.gz \
 		sbin/${PORTNAME}
 PORTDOCS=	AUTHORS NEWS README.md
 
 OPTIONS_DEFINE=		DEVD DOCS
 OPTIONS_DEFAULT=	DEVD
 
 DEVD_SUB_FILES=		${PORTNAME}.conf
 DEVD_PLIST_FILES=	etc/devd/${PORTNAME}.conf
 
 post-patch:
 	@echo "${DISTVERSIONFULL}" > ${WRKSRC}/.tarball-version
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DEVD-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.mk>
diff --git a/comms/usbmuxd/files/usbmuxd.conf.in b/comms/usbmuxd/files/usbmuxd.conf.in
index b0cd9685332e..62b79de65440 100644
--- a/comms/usbmuxd/files/usbmuxd.conf.in
+++ b/comms/usbmuxd/files/usbmuxd.conf.in
@@ -1,26 +1,26 @@
 # This entry starts the Apple mobile device muxer 'usbmuxd' upon device attach
 # of a matching Apple product including iPhone, iPad, and iPod. It also allows
 # members of the '%%GROUPS%%' group to access the devices.
 #
 # Multiple devices may be attached simultaneously. The muxer will stop upon
 # detach of the last matching device.
 
 notify 100 {
 	match "system"		"USB";
 	match "subsystem"	"DEVICE";
 	match "type"		"ATTACH";
 	match "vendor"		"0x05ac";
 	match "product"		"(0x12[9a][0-9a-f]|0x8600)";
 	action "chgrp %%GROUPS%% /dev/$cdev; chmod g+rw /dev/$cdev";
 	action "%%PREFIX%%/sbin/usbmuxd -U %%USERS%% -z";
 };
 
 notify 100 {
-        match "system"          "USB";
-        match "subsystem"       "DEVICE";
-        match "type"            "DETACH";
-        match "vendor"          "0x05ac";
-	match "product"         "(0x12[9a][0-9a-f]|0x8600)";
+	match "system"		"USB";
+	match "subsystem"	"DEVICE";
+	match "type"		"DETACH";
+	match "vendor"		"0x05ac";
+	match "product"		"(0x12[9a][0-9a-f]|0x8600)";
 	action "%%PREFIX%%/sbin/usbmuxd -x";
+	action "sleep 5";
 };
-