Index: release/tools/ec2.conf
===================================================================
--- release/tools/ec2.conf
+++ release/tools/ec2.conf
@@ -108,6 +108,12 @@
 		's/^#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' \
 		${DESTDIR}/etc/ssh/sshd_config
 
+	# Use FreeBSD Update and Portsnap mirrors hosted in AWS
+	sed -i '' -e 's/update.FreeBSD.org/aws.update.FreeBSD.org/' \
+		${DESTDIR}/etc/freebsd-update.conf
+	sed -i '' -e 's/portsnap.FreeBSD.org/aws.portsnap.FreeBSD.org/' \
+		${DESTDIR}/etc/portsnap.conf
+
 	# Use the NTP service provided by Amazon
 	sed -i '' -e 's/^pool/#pool/' \
 		-e '1,/^#server/s/^#server.*/server 169.254.169.123 iburst/' \