diff --git a/.gitignore b/.gitignore
index 19e46a4..9dbc793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@
 /osbuild-80.tar.gz
 /osbuild-81.tar.gz
 /osbuild-82.tar.gz
+/osbuild-84.tar.gz
diff --git a/osbuild.spec b/osbuild.spec
index 252cd26..af8ac5a 100644
--- a/osbuild.spec
+++ b/osbuild.spec
@@ -1,7 +1,7 @@
 %global         forgeurl https://github.com/osbuild/osbuild
 %global         selinuxtype targeted
 
-Version:        82
+Version:        84
 
 %forgemeta
 
@@ -15,11 +15,6 @@ License:        Apache-2.0
 URL:            %{forgeurl}
 
 Source0:        %{forgesource}
-
-# https://github.com/osbuild/osbuild/pull/1287
-Patch0:         0001-Test-port-assembler-tests-from-unittest-to-pytest.patch
-Patch1:         0002-Test-add-ability-to-skip-tests-for-unsupported-file-.patch
-
 BuildArch:      noarch
 Summary:        A build system for OS images
 
@@ -126,7 +121,7 @@ Contains additional tools and utilities for development of
 manifests and osbuild.
 
 %prep
-%forgeautosetup -p1
+%forgesetup
 
 %build
 %py3_build
@@ -257,6 +252,9 @@ fi
 
 
 %changelog
+* Thu Apr 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
+- New upstream release
+
 * Wed Mar 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
 - New upstream release
 
diff --git a/sources b/sources
index 6b3002f..c9b6941 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-82.tar.gz) = f25ca1dd03b0c2b8a2e6d9940585a73e5e8ee66da30e828302e73949dbe7defd6df2d8429ded35c94b15582b822156228f196547d43544866eb46d5992c74bb1
+SHA512 (osbuild-84.tar.gz) = e0401026dcfe99b71ba825d1ec585eea2c91d570dbda92a9b4c49172d653b9774e1f795978657797b6b5476416b873558adc2a6193eca4305a8e58b9a7573213