diff --git a/grub/grubby/debian/deb_folder/changelog b/grub/grubby/debian/deb_folder/changelog
new file mode 100644
index 000000000..9ba9d1b64
--- /dev/null
+++ b/grub/grubby/debian/deb_folder/changelog
@@ -0,0 +1,5 @@
+grubby (8.4-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Charles Short <charles.short@windriver.com>  Wed, 02 Feb 2022 13:30:33 +0000
diff --git a/grub/grubby/debian/deb_folder/control b/grub/grubby/debian/deb_folder/control
new file mode 100644
index 000000000..b1bdd414f
--- /dev/null
+++ b/grub/grubby/debian/deb_folder/control
@@ -0,0 +1,16 @@
+Source: grubby
+Section: admin
+Priority: optional
+Maintainer: StarlingX Developers <starlingx-dev@lists.starlingx.io>
+Build-Depends: debhelper-compat (= 13), libblkid-dev, libpopt-dev
+Standards-Version: 4.5.1
+Homepage: https://www.github.com/rhboot/grubby
+Rules-Requires-Root: no
+
+Package: grubby
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Command line tool for updating bootloader configs
+ This package provides a grubby compatibility script that manages
+ BootLoaderSpec files and is meant to be backward compatible with
+ the previous grubby tool.
diff --git a/grub/grubby/debian/deb_folder/copyright b/grub/grubby/debian/deb_folder/copyright
new file mode 100644
index 000000000..667c198f1
--- /dev/null
+++ b/grub/grubby/debian/deb_folder/copyright
@@ -0,0 +1,41 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: grubby
+Source: https://github.com/rhboot/grubby
+
+Files: *
+Copyright: (C) 2007 - 2009 Red Hat, Inc.  All rights reserved.
+License: GPL-2+
+  This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: debian/*
+Copyright: 2022 Wind River
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/grub/grubby/debian/deb_folder/rules b/grub/grubby/debian/deb_folder/rules
new file mode 100755
index 000000000..755d5bdcd
--- /dev/null
+++ b/grub/grubby/debian/deb_folder/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+%:
+	dh $@
+
+override_dh_install:
+	# nothing to be done here
+
+override_dh_auto_install:
+	mkdir -p $(CURDIR)/debian/grubby/usr/sbin
+	mkdir -p $(CURDIR)/debian/grubby/usr/share/man/man8
+	install -m 755 grubby $(CURDIR)/debian/grubby/usr/sbin/grubby
+	install -m 755 installkernel $(CURDIR)/debian/grubby/usr/sbin/installkernel
+	install -m 755 new-kernel-pkg $(CURDIR)/debian/grubby/usr/sbin/new-kernel-pkg
+	cp grubby.8 $(CURDIR)/debian/grubby/usr/share/man/man8
+	cp new-kernel-pkg.8 $(CURDIR)/debian/grubby/usr/share/man/man8
+	dh_install
+
+override_dh_auto_test:
+	# nothing to be done here
diff --git a/grub/grubby/debian/deb_folder/source/format b/grub/grubby/debian/deb_folder/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/grub/grubby/debian/deb_folder/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/grub/grubby/debian/meta_data.yaml b/grub/grubby/debian/meta_data.yaml
new file mode 100644
index 000000000..8620b77c0
--- /dev/null
+++ b/grub/grubby/debian/meta_data.yaml
@@ -0,0 +1,10 @@
+---
+debname: grubby
+debver: 8.4
+dl_path:
+  name: grubby-8.4.tar.gz
+  url: https://github.com/rhboot/grubby/archive/66fd06e2346a9f334a4e5d426332e74319f927c2.tar.gz
+  md5sum: cbe22140baf6569f19c2e6149ea7748b
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: True