diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index c30ce87..c197ff6 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFLASH_VERSION = v6.4-rc1
+LIBFLASH_VERSION = v6.4
 LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
 
 LIBFLASH_INSTALL_STAGING = YES
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index c9df3ec..1944e94 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.4-rc1" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.4" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION