diff --git a/.gitignore b/.gitignore
index b7664eb..b764e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -372,3 +372,4 @@
 /awscli-1.19.52.tar.gz
 /awscli-1.19.53.tar.gz
 /awscli-1.19.54.tar.gz
+/1.19.54.tar.gz
diff --git a/awscli.spec b/awscli.spec
index b737da4..81ed607 100644
--- a/awscli.spec
+++ b/awscli.spec
@@ -1,3 +1,6 @@
+# NOTE(mhayden): The package is awscli, but the source is aws-cli.
+%define source_name aws-cli
+
 Name:           awscli
 Version:        1.19.54
 Release:        1%{?dist}
@@ -5,7 +8,7 @@ Summary:        Universal Command Line Environment for AWS
 
 License:        ASL 2.0 and MIT
 URL:            https://aws.amazon.com/cli/
-Source0:        %{pypi_source}
+Source0:        https://github.com/aws/aws-cli/archive/refs/tags/%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python3-colorama
@@ -13,6 +16,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-docutils
 BuildRequires:  python3-mock
 BuildRequires:  python3-nose
+BuildRequires:  python3-pyyaml
 BuildRequires:  python3-rsa
 BuildRequires:  python3-s3transfer
 BuildRequires:  python3-setuptools
@@ -30,8 +34,7 @@ This package provides a unified
 command line interface to Amazon Web Services.
 
 %prep
-%autosetup -n %{name}-%{version} -p 1
-rm -vr %{name}.egg-info
+%autosetup -n %{source_name}-%{version} -p 1
 find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' +
 
 # https://github.com/aws/aws-cli/issues/4837
@@ -896,7 +899,7 @@ nosetests-%{python3_version} \
 
 * Thu Oct 10 2019 David Duncan <davdunc@amazon.com> - 1.16.253-2
 - Merge changes from 1.16.253 release.
-- Remove relax-dependencies patch requirement. 
+- Remove relax-dependencies patch requirement.
 
 * Fri Oct 04 2019 David Duncan <davdunc@amazon.com> - 1.16.253-1
 - Merge changes from 1.16.253 release.
@@ -927,7 +930,7 @@ nosetests-%{python3_version} \
 
 * Thu Sep 19 2019 David Duncan <davdunc@amazon.com - 1.16.241-1
 - Update to 1.16.241
- 
+
 * Mon Sep 09 2019 Kevin Fenzi <kevin@scrye.com> - 1.16.235-2
 - Rebuild with correct patch.
 
@@ -958,7 +961,7 @@ nosetests-%{python3_version} \
 - Add updates and fixes
 
 * Wed Apr 24 2019 David Duncan <davdunc@amazon.com> - 1.16.145-1
-- Adding support for ap-east-1 
+- Adding support for ap-east-1
 
 * Thu Mar 21 2019 David Duncan <davdunc@amazon.com> - 1.16.129-1
 - Bumping version to 1.16.129
diff --git a/sources b/sources
index b6c50d5..ee285ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (awscli-1.19.54.tar.gz) = 94d091d6c6ae7f3f489103a25b07175316b7e01455c6c4a8ccffbcd82b4f2579fb4ed101838f25eda183f875072a5012f422401fd28df0f8af360a1d0ad1b501
+SHA512 (1.19.54.tar.gz) = 2e52c296e1ef5353746271c20e90c7cb50553b571c2d12d7ba257cd9fe9698f7f7b59506fffdb22685161af2cb80ce755bd41c6097d3790db147360529a303e2