Index: head/sysutils/azure-agent/Makefile
===================================================================
--- head/sysutils/azure-agent/Makefile
+++ head/sysutils/azure-agent/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	azure-agent
-PORTVERSION=	2.2.8
+PORTVERSION=	2.2.13
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
-DISTVERSIONPREFIX= v
 
 MAINTAINER=	honzhan@microsoft.com
-COMMENT=	The Microsoft Azure Linux Agent
+COMMENT=	Microsoft Azure Linux Agent
 
 LICENSE=	APACHE20
 
@@ -23,9 +23,10 @@
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 python_OLD_CMD=	"/usr/bin/env python"
 
-USE_GITHUB=     yes
-GH_ACCOUNT=     Azure
-GH_PROJECT=     WALinuxAgent
+USE_GITHUB=	yes
+GH_ACCOUNT=	Azure
+GH_PROJECT=	WALinuxAgent
+USE_PYTHON=	autoplist distutils
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \
@@ -43,7 +44,7 @@
 		${WRKSRC}/bin/waagent2.0
 	${REINPLACE_CMD} -e "s,/usr/bin/python,${PREFIX}/bin/python,g" \
 		${WRKSRC}/init/waagent.service
-
-USE_PYTHON=	autoplist distutils
+	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
+		${WRKSRC}/init/freebsd/waagent
 
 .include <bsd.port.mk>
Index: head/sysutils/azure-agent/distinfo
===================================================================
--- head/sysutils/azure-agent/distinfo
+++ head/sysutils/azure-agent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495743874
-SHA256 (Azure-WALinuxAgent-v2.2.8_GH0.tar.gz) = 8d8863199ac7d6eca8cbaaa9f843ab3da853060bb2588141e85a6134d2e07b5f
-SIZE (Azure-WALinuxAgent-v2.2.8_GH0.tar.gz) = 638305
+TIMESTAMP = 1497364262
+SHA256 (Azure-WALinuxAgent-v2.2.13_GH0.tar.gz) = 7a5739f5be91107afb6bfcf7acc93aff50638820c368ff0845a9899274291ee0
+SIZE (Azure-WALinuxAgent-v2.2.13_GH0.tar.gz) = 690906