diff --git a/.gitignore b/.gitignore
index 43246ca..eea3278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,3 +121,12 @@ buildbot-0.7.12.tar.gz
 /buildbot-worker-3.3.0.tar.gz
 /buildbot-wsgi-dashboards-3.3.0.tar.gz
 /buildbot-www-3.3.0.tar.gz
+/buildbot-3.5.0.tar.gz
+/buildbot-badges-3.5.0.tar.gz
+/buildbot-console-view-3.5.0.tar.gz
+/buildbot-grid-view-3.5.0.tar.gz
+/buildbot-pkg-3.5.0.tar.gz
+/buildbot-waterfall-view-3.5.0.tar.gz
+/buildbot-worker-3.5.0.tar.gz
+/buildbot-wsgi-dashboards-3.5.0.tar.gz
+/buildbot-www-3.5.0.tar.gz
diff --git a/0001-ec2-Set-AMI-for-latent-worker-before-making-spot-req.patch b/0001-ec2-Set-AMI-for-latent-worker-before-making-spot-req.patch
deleted file mode 100644
index b364692..0000000
--- a/0001-ec2-Set-AMI-for-latent-worker-before-making-spot-req.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a835c5283ac34af35418aa12b62e03b0894e5e31 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Mon, 16 Aug 2021 21:20:13 -0400
-Subject: [PATCH] ec2: Set AMI for latent worker before making spot request
-
-When trying to set up latent workers where the AMI is dynamically
-discovered as part of instantiating workers, we want to make sure
-that AMI is set before we make the spot request so that it is used
-for the spot request.
-
-(cherry picked from commit 0310a1672692d5c39a55d6769490533d71925534)
----
- .../newsfragments/enable-ami-runtime-determinism.bugfix         | 1 +
- master/buildbot/worker/ec2.py                                   | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 master/buildbot/newsfragments/enable-ami-runtime-determinism.bugfix
-
-diff --git a/master/buildbot/newsfragments/enable-ami-runtime-determinism.bugfix b/master/buildbot/newsfragments/enable-ami-runtime-determinism.bugfix
-new file mode 100644
-index 000000000..ade48e2bd
---- /dev/null
-+++ b/master/buildbot/newsfragments/enable-ami-runtime-determinism.bugfix
-@@ -0,0 +1 @@
-+Set AMI for latent worker before making spot request to enable dynamically setting AMIs for instantiating workers
-diff --git a/master/buildbot/worker/ec2.py b/master/buildbot/worker/ec2.py
-index ab60d5b95..382e4dc00 100644
---- a/master/buildbot/worker/ec2.py
-+++ b/master/buildbot/worker/ec2.py
-@@ -448,6 +448,7 @@ class EC2LatentWorker(AbstractLatentWorker):
-         log.msg('%s %s requesting spot instance with price %0.4f' %
-                 (self.__class__.__name__, self.workername, bid_price))
- 
-+        image = self.get_image()
-         reservations = self.ec2.meta.client.request_spot_instances(
-             SpotPrice=str(bid_price),
-             LaunchSpecification=self._remove_none_opts(
-@@ -473,7 +474,6 @@ class EC2LatentWorker(AbstractLatentWorker):
-             raise LatentWorkerFailedToSubstantiate()
-         instance_id = request['InstanceId']
-         self.instance = self.ec2.Instance(instance_id)
--        image = self.get_image()
-         instance_id, start_time = self._wait_for_instance()
-         return instance_id, image.id, start_time
- 
--- 
-2.31.1
-
diff --git a/buildbot.spec b/buildbot.spec
index f15dfbc..ea45245 100644
--- a/buildbot.spec
+++ b/buildbot.spec
@@ -20,8 +20,8 @@
 %endif
 
 Name:           buildbot
-Version:        3.3.0
-Release:        6%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 
 Summary:        Build/test automation system
 License:        GPLv2
@@ -41,9 +41,6 @@ Source8:        %{pypi_source buildbot-pkg}
 Source10:       buildbot-master@.service
 Source11:       buildbot-worker@.service
 
-# Backports from upstream
-Patch0001:      0001-ec2-Set-AMI-for-latent-worker-before-making-spot-req.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -324,9 +321,6 @@ Summary:        Buildbot documentation
 %prep
 %setup -q -b0 -b1 -b2 -b3 -b4 -b5 -b6 -b7 -b8
 
-# Apply patches for master
-%patch -p2 -P 0001
-
 
 %build
 %py3_build
@@ -402,6 +396,9 @@ trial buildbot.test
 %endif
 
 %changelog
+* Wed Aug 10 2022 Gwyn Ciesla <gwync@protonmail.com> - 3.5.0-1
+- 3.5.0
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 09207e2..6a1c3c5 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
-SHA512 (buildbot-3.3.0.tar.gz) = da0d26257964df40a470b00e2cd0f3f2230d3224bf8ae7c2b896fc8ec739e5d3ce7988ab07f6c66dcb13b0d4b6916e839f53a025cac637ccd4bcd3f442e12b1d
-SHA512 (buildbot-badges-3.3.0.tar.gz) = 67c1c17c987a273ada1ac593cfe1242ef4861759f13a01ccfd2d1d62a6513497085773f0e6e685d0950f9a23f988789b3f273882ac647c7ba67099f49c1188bf
-SHA512 (buildbot-console-view-3.3.0.tar.gz) = 3b2c64205bd46b01cb9e86d3e13d809c777ba433cf052d82ef7aa0951f0e47f1a08435ba34fd9e21c902ec3b67fa7ce2ce256f21f79d23a2e97f2fbe6315f920
-SHA512 (buildbot-grid-view-3.3.0.tar.gz) = ce6e5fbe6b4874631f3de9964a0acae55c6c4fab408bd4c420c829701a6d5503d7bee92bac8db54c630bdc0164c45288503480e1073865420996951a9c6f0d06
-SHA512 (buildbot-pkg-3.3.0.tar.gz) = 73b6d61c27336450e8a9df1094c8afbb7653b33517f6a55e35a1ef62125b969f8ddf0a94ad11c7da15489fca2e6a7ad853093a946945c511140e61f3341ad2c0
-SHA512 (buildbot-waterfall-view-3.3.0.tar.gz) = 9de38247aad595ac9ac017eec04602160b5e74eff7eb061651e683b6cd8afb20aca57a78c8a5445ae78bffa9ce0398f9abdc3cf046dd152788324d2f3e52ed12
-SHA512 (buildbot-worker-3.3.0.tar.gz) = e75a7a91a5b2c418dae65abdd1dde2b840a840e5b9cc1a218007a9e33e1cd58288bc708ec43ecfd9ec74a257809a59f65923ec8dc8aee1ef28cfaf82314964e3
-SHA512 (buildbot-wsgi-dashboards-3.3.0.tar.gz) = bd791710f5788ff44be784549535c3043babea3c672c8e26f4563d1e5c5f217eff87b142ffbea3d94a6764cd2e5b422f48158cd70dfd8c1225ae299304903861
-SHA512 (buildbot-www-3.3.0.tar.gz) = 9d332a0f70815cf7e9d3a6897f2733bd33b6938fe49cb1a879023235d159d7cd4e3faa0fca74e16a64cebe1248929a43aff0000e805011f506c4febf10b03f90
+SHA512 (buildbot-3.5.0.tar.gz) = 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
+SHA512 (buildbot-badges-3.5.0.tar.gz) = 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
+SHA512 (buildbot-console-view-3.5.0.tar.gz) = 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
+SHA512 (buildbot-grid-view-3.5.0.tar.gz) = a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
+SHA512 (buildbot-pkg-3.5.0.tar.gz) = 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
+SHA512 (buildbot-waterfall-view-3.5.0.tar.gz) = 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
+SHA512 (buildbot-worker-3.5.0.tar.gz) = 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+SHA512 (buildbot-wsgi-dashboards-3.5.0.tar.gz) = d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
+SHA512 (buildbot-www-3.5.0.tar.gz) = f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e