diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
new file mode 100644
index 0000000000..aebcc16329
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg
@@ -0,0 +1,4 @@
+# CoreOS GRUB settings for EC2
+
+# Blacklist the Xen framebuffer module so it doesn't get loaded at boot
+set linux_append="modprobe.blacklist=xen_fbfront"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r2.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r2.ebuild
index 8619320a9f..d83e5efb76 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r2.ebuild
@@ -43,4 +43,7 @@ src_prepare() {
 src_install() {
 	insinto "/usr/share/oem"
 	doins ${T}/cloud-config.yml
+	if use ec2 ; then
+		newins ${FILESDIR}/grub-ec2.cfg grub.cfg
+	fi
 }