diff --git a/efibootmgr-16-efidp_format_device_path-argfix.patch b/efibootmgr-16-efidp_format_device_path-argfix.patch
deleted file mode 100644
index 15741e2..0000000
--- a/efibootmgr-16-efidp_format_device_path-argfix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -r -u -x .git ../efibootmgr-16.orig/src/efibootdump.c ./src/efibootdump.c
---- ../efibootmgr-16.orig/src/efibootdump.c	2018-04-09 15:38:51.000000000 -0500
-+++ ./src/efibootdump.c	2020-08-06 15:27:27.679192698 -0500
-@@ -67,8 +67,8 @@
- 	text_path = alloca(text_path_len);
- 	if (!text_path)
- 		error(100, "Couldn't allocate memory");
--	rc = efidp_format_device_path(text_path, text_path_len,
--				      dp, pathlen);
-+	rc = efidp_format_device_path((unsigned char *)text_path,
-+				      text_path_len, dp, pathlen);
- 	if (rc < 0) {
- 		printf("<bad device path>");
- 		return;
-diff -r -u -x .git ../efibootmgr-16.orig/src/efibootmgr.c ./src/efibootmgr.c
---- ../efibootmgr-16.orig/src/efibootmgr.c	2018-04-09 15:38:51.000000000 -0500
-+++ ./src/efibootmgr.c	2020-08-06 15:27:12.433089400 -0500
-@@ -941,8 +941,8 @@
- 			pathlen = efi_loadopt_pathlen(load_option,
- 						      boot->data_size);
- 			dp = efi_loadopt_path(load_option, boot->data_size);
--			rc = efidp_format_device_path(text_path, text_path_len,
--						      dp, pathlen);
-+			rc = efidp_format_device_path((unsigned char *)text_path,
-+						      text_path_len, dp, pathlen);
- 			if (rc < 0)
- 				error(18, "Could not parse device path");
- 			rc += 1;
-@@ -952,8 +952,8 @@
- 			if (!text_path)
- 				error(19, "Could not parse device path");
- 
--			rc = efidp_format_device_path(text_path, text_path_len,
--						      dp, pathlen);
-+			rc = efidp_format_device_path((unsigned char *)text_path,
-+						      text_path_len, dp, pathlen);
- 			if (rc < 0)
- 				error(20, "Could not parse device path");
- 			printf("\t%s", text_path);
-diff -r -u -x .git ../efibootmgr-16.orig/src/eficonman.c ./src/eficonman.c
---- ../efibootmgr-16.orig/src/eficonman.c	2018-04-09 15:38:51.000000000 -0500
-+++ ./src/eficonman.c	2020-08-06 15:08:19.614514403 -0500
-@@ -76,7 +76,7 @@
- 		dp = whole_dp;
- 		while (dp) {
- 			ssize_t sz, ssz;
--			char *s = NULL;
-+			unsigned char *s = NULL;
- 
- 			if (efidp_is_multiinstance(dp)) {
- 				sz = efidp_instance_size(dp);
diff --git a/efibootmgr.patches b/efibootmgr.patches
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/efibootmgr.patches
diff --git a/efibootmgr.spec b/efibootmgr.spec
index b2777f3..aac9d97 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,8 +1,8 @@
 %define efivar_version 35-2
 
 Name: efibootmgr
-Version: 16
-Release: 12%{?dist}
+Version: 17
+Release: 1%{?dist}
 Summary: EFI Boot Manager
 License: GPLv2+
 URL: https://github.com/rhboot/%{name}/
@@ -18,10 +18,9 @@ Requires: efi-filesystem
 ExclusiveArch: %{efi}
 
 Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Source1: efibootmgr.patches
 
-# Fixes to compiler errors manually cherry picked from upstream commit
-# https://github.com/rhboot/efibootmgr/commit/e8ce9fecebd15adb4c60a0678d4c417afe06dde4
-Patch0: efibootmgr-16-efidp_format_device_path-argfix.patch
+%include %{SOURCE1}
 
 %description
 %{name} displays and allows the user to edit the Intel Extensible
@@ -47,6 +46,9 @@ git config --local --add efibootmgr.efidir %{efi_vendor}
 %doc README
 
 %changelog
+* Tue Jul 05 2022 Robbie Harwood <rharwood@redhat.com> - 17-1
+- New upstream version (17)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 16-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 1f47dc1..23ca1b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (efibootmgr-16.tar.bz2) = 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
+SHA512 (efibootmgr-17.tar.bz2) = 59a2a6e7885886ab3cdd2e733f1ae2d2fc76b307a9848706af6bf4197acbea8d2a0b1105fc4983252c8d204af974b417a03b9cc66d0541f8a68503c47268a601