diff --git a/astropy-5.0.2.tar.gz b/astropy-5.0.2.tar.gz
deleted file mode 100644
index aa31514..0000000
--- a/astropy-5.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:449f0ba5e7292457eed37550b047444751a606e7b8a34f93b1c28d0bb63e7f40
-size 7837851
diff --git a/astropy-5.0.4.tar.gz b/astropy-5.0.4.tar.gz
new file mode 100644
index 0000000..2f315d2
--- /dev/null
+++ b/astropy-5.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:001184f1a9c3f526a363883ce28efb9cbf076df3d151ca3e131509a248f0dfb9
+size 7851964
diff --git a/python-astropy.changes b/python-astropy.changes
index 1d2aa0d..c6b7deb 100644
--- a/python-astropy.changes
+++ b/python-astropy.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Fri Apr  1 17:57:36 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Update to 5.0.4
+  # Bug Fixes
+  ## astropy.modeling
+  * Fixed the Gaussian2D bounding_box when theta is an angular
+    Quantity. [#13021]
+  ## astropy.utils
+  * Reverted astropy.utils.iers.iers.IERS_A_URL to
+    maia.usno.navy.mil domain instead of NASA FTP to work around
+    server issues. [#13004]
+  # Other Changes and Additions
+  * Updated bundled WCSLIB to version 7.9 with several bugfixes and
+    added support for time coordinate axes in wcsset() and
+    wcssub(). The four-digit type code for the time axis will have
+    the first digit set to 4, i.e., four digit code will be 4xxx
+    where x is a digit 0-9. For a full list of bug fixes see
+    https://www.atnf.csiro.au/people/mcalabre/WCS/CHANGES [#12994]
+    (when building --without system_wcslib)
+- Release 5.0.3
+  # Bug Fixes
+  ## astropy.convolution
+  * Bugfix in astropy.convolution.utils.discretize_model which
+    allows the function to handle a CompoundModel. Before this fix,
+    discretize_model was confusing CompoundModel with a callable
+    function. [#12959]
+  ## astropy.io.fits
+  * Fix write and read FITS tables with multidimensional items,
+    using from_columns without previousely defined ColDefs
+    structure. [#12863]
+  ## astropy.io.votable
+  * Fix VOTable linting to avoid use of shell option. [#12985]
+   astropy.utils
+  * Fix XML linting to avoid use of shell option. [#12985]
+  # Other Changes and Additions
+  * Updated the bundled CFITSIO library to 4.1.0. [#12967]
+    (when building --without system_cfitsio)
+
 -------------------------------------------------------------------
 Sun Mar 13 08:10:02 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-astropy.spec b/python-astropy.spec
index c007fe3..b4835d1 100644
--- a/python-astropy.spec
+++ b/python-astropy.spec
@@ -30,9 +30,15 @@
 # backwards compatibility for --without systemlibs
 %bcond_without systemlibs
 
+%if %{with systemlibs}
 %bcond_without system_cfitsio
 %bcond_without system_expat
 %bcond_without system_wcslib
+%else
+%bcond_with system_cfitsio
+%bcond_with system_expat
+%bcond_with system_wcslib
+%endif
 
 %if %{with system_cfitsio}
 %define unbundle_cfitsio export ASTROPY_USE_SYSTEM_CFITSIO=1
@@ -50,7 +56,7 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define         skip_python2 1
 Name:           python-astropy%{psuffix}
-Version:        5.0.2
+Version:        5.0.4
 Release:        0
 Summary:        Community-developed python astronomy tools
 License:        BSD-3-Clause