diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index bb86513..c30ce87 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFLASH_VERSION = v6.3
+LIBFLASH_VERSION = v6.4-rc1
 LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
 
 LIBFLASH_INSTALL_STAGING = YES
@@ -51,7 +51,7 @@
 		DESTDIR=$(TARGET_DIR) $(LIBFLASH_MAKE_ENV) \
 		       -C $(@D)/external/pflash install)
 	$(if $(BR2_PACKAGE_OPAL_GARD),
-		$(INSTALL) $(@D)/external/gard/gard $(TARGET_DIR)/usr/bin/opal-gard)
+		$(INSTALL) $(@D)/external/gard/opal-gard $(TARGET_DIR)/usr/bin/opal-gard)
 endef
 
 define HOST_LIBFLASH_INSTALL_CMDS
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index e42cd9c..c9df3ec 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v6.3-231-g0bf01d93ee39" if BR2_SKIBOOT_LATEST_VERSION
+	default "v6.4-rc1" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION