diff --git a/openpower/package/libflash/Config.in b/openpower/package/libflash/Config.in
index 3fb323f..b4f6c7a 100644
--- a/openpower/package/libflash/Config.in
+++ b/openpower/package/libflash/Config.in
@@ -5,5 +5,12 @@
 
 config BR2_PACKAGE_PFLASH
 	bool "pflash"
+	default y if BR2_PACKAGE_LIBFLASH
 	help
 	  Install pflash utility to target
+
+config BR2_PACKAGE_OPAL_GARD
+	bool "opal-gard"
+	default y if BR2_PACKAGE_LIBFLASH
+	help
+	  Install opal-gard utility to target
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index 3e2abe7..e0c59af 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBFLASH_VERSION = v5.10.1
+LIBFLASH_VERSION = v6.2-rc1
 LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
 
 LIBFLASH_INSTALL_STAGING = YES
@@ -27,11 +27,16 @@
 	$(if $(BR2_PACKAGE_PFLASH),
 		PREFIX=$(STAGING_DIR)/usr $(LIBFLASH_MAKE_ENV) \
 		       -C $(@D)/external/pflash)
+	$(if $(BR2_PACKAGE_OPAL_GARD),
+		PREFIX=$(STAGING_DIR)/usr $(LIBFLASH_MAKE_ENV) \
+		       -C $(@D)/external/gard)
 endef
 
 define HOST_LIBFLASH_BUILD_CMDS
     $(HOST_MAKE_ENV) SKIBOOT_VERSION=$(LIBFLASH_VERSION) \
 	    $(MAKE) -C $(@D)/external/pflash
+    $(HOST_MAKE_ENV) SKIBOOT_VERSION=$(LIBFLASH_VERSION) \
+	    $(MAKE) -C $(@D)/external/gard
 endef
 
 define LIBFLASH_INSTALL_STAGING_CMDS
@@ -45,6 +50,8 @@
 	$(if $(BR2_PACKAGE_PFLASH),
 		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)
 endef
 
 define HOST_LIBFLASH_INSTALL_CMDS