Index: sysutils/azure-agent/Makefile
===================================================================
--- sysutils/azure-agent/Makefile
+++ sysutils/azure-agent/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	azure-agent
 PORTVERSION=	2.2.13
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	honzhan@microsoft.com
@@ -35,6 +36,7 @@
 		${WRKSRC}/init/waagent ${WRKSRC}/init/waagent.service \
 		${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \
+			 -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \
 		${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 		${WRKSRC}/bin/waagent2.0 \
@@ -46,5 +48,10 @@
 		${WRKSRC}/init/waagent.service
 	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
 		${WRKSRC}/init/freebsd/waagent
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/config/freebsd/waagent.conf \
+		${STAGEDIR}${PREFIX}/etc/waagent.conf.sample
 
 .include <bsd.port.mk>
Index: sysutils/azure-agent/pkg-plist
===================================================================
--- /dev/null
+++ sysutils/azure-agent/pkg-plist
@@ -0,0 +1 @@
+@sample etc/waagent.conf.sample