diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 3e4a4864adfe..922f8d9d406f 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -6,25 +6,14 @@
 # Set to a list of packages to install.
 # Example:
 #export VM_EXTRA_PACKAGES="www/apache24"
-export VM_EXTRA_PACKAGES=
+export VM_EXTRA_PACKAGES="sysutils/azure-agent"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 # Example:
 #export VM_RC_LIST="apache24"
 export VM_RC_LIST=
 
-vm_extra_install_base() {
-	fetch -o ${DESTDIR}/usr/sbin/waagent \
-		http://people.freebsd.org/~gjb/waagent
-	chmod +x ${DESTDIR}/usr/sbin/waagent
-	rm -f ${DESTDIR}/etc/resolv.conf
-
-	return 0
-}
-
 vm_extra_pre_umount() {
-	chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg install -y \
-		python python2 python27 py27-asn1 sudo bash
 	chroot ${DESTDIR} /usr/sbin/waagent -verbose -install
 	yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf