diff --git a/Config.mk b/Config.mk
index 28390485b7..c099f3da46 100644
--- a/Config.mk
+++ b/Config.mk
@@ -254,10 +254,10 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
 MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
 endif
 OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
-QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.3
+QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.4
 # Wed Sep 16 17:38:44 2015 +0200
 # trace: remove malloc tracing
-MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.3
+MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.6.4
 # Fri May 13 15:21:10 2016 +0100
 # lib/sys.c: enclose file_types in define guards
 
@@ -268,7 +268,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2
 ETHERBOOT_NICS ?= rtl8139 8086100e
 
 
-QEMU_TRADITIONAL_REVISION ?= cff044b5c8bf51d9c9f3f9439671ed378857928a
+QEMU_TRADITIONAL_REVISION ?= xen-4.6.4
 # Tue Jul 26 15:31:59 2016 +0100
 # virtio: error out if guest exceeds virtqueue size
 
diff --git a/xen/Makefile b/xen/Makefile
index 7d8643833c..0d7e5b79f7 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 6
-export XEN_EXTRAVERSION ?= .4-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version