diff --git a/nextcloud-README.fedora b/nextcloud-README.fedora
index b64fc8d..748b6cf 100644
--- a/nextcloud-README.fedora
+++ b/nextcloud-README.fedora
@@ -12,7 +12,7 @@ If not, make sure your webserver is running properly.
 
 Webserver
 ---------
-Currently nextcloud in Fedora supports httpd (Apache) and nginx. You must install
+Currently nextcloud in Fedora/EPEL supports httpd (Apache) and nginx. You must install
 at least one webserver subpackage (nextcloud-<webserver>). These packages
 include additional configuration files for the webservers. Remote access is
 disabled by default on httpd. To enable access from any host for Apache **AFTER** you
@@ -67,7 +67,7 @@ ownership and SELinux context attributes.
 Logging
 -------
 As specified by the configuration file, nextcloud sends messages to the system
-logger, which means in a standard Fedora configuration it will log to the
+logger, which means in a standard Fedora/EPEL configuration it will log to the
 systemd journal: try "journalctl -b -t Nextcloud". You can also change the
 loglevel or switch to the built-in log mechanism of nextcloud.
 
@@ -115,4 +115,4 @@ systemctl enable --now nextcloud-cron.timer
 Migration from owncloud
 -----------------------
 
-For detailed instructions on this please read MIGRATION.fedora
+For detailed instructions on this please read MIGRATION.distro
diff --git a/nextcloud-httpd.conf b/nextcloud-httpd.conf
index f9ac85d..b009fd2 100644
--- a/nextcloud-httpd.conf
+++ b/nextcloud-httpd.conf
@@ -13,6 +13,9 @@ Alias /nextcloud/apps-appstore /var/lib/nextcloud/apps
 Alias /nextcloud/assets /var/lib/nextcloud/assets
 Alias /nextcloud /usr/share/nextcloud
 
+# This must be set explicitly in some environments, such as el9
+AddType text/javascript .mjs
+
 # Allows compliant CalDAV / CardDAV clients to be configured using only
 # the domain name. For more details see # http://tools.ietf.org/html/rfc6764
 
diff --git a/nextcloud.spec b/nextcloud.spec
index f790d57..e077536 100644
--- a/nextcloud.spec
+++ b/nextcloud.spec
@@ -1,3 +1,9 @@
+%if 0%{?fedora}
+%global distro fedora
+%else
+%global distro epel
+%endif
+
 Name:           nextcloud
 Version:        28.0.6
 Release:        %autorelease
@@ -38,12 +44,8 @@ Patch0:         0000-disable-update-version-check.patch
 Patch1:         0001-mangle-shebang.patch
 
 BuildArch:      noarch
-# For the systemd macros
-%if 0%{?fedora} > 29
 BuildRequires:  systemd-rpm-macros
-%else
-BuildRequires:  systemd
-%endif
+
 # expand pear macros on install
 BuildRequires:  php-pear
 
@@ -305,10 +307,13 @@ find . -name .github    -type d -prune -exec rm -r {} \; -print
 sed -i -e 's#./\(occ upgrade\)#sudo -u apache php /usr/share/nextcloud/\1#' core/templates/update.admin.php
 
 # prepare package doc
-cp %{SOURCE300} README.fedora
+cp %{SOURCE300} README.%{distro}
 cp %{SOURCE301} README.mysql
 cp %{SOURCE302} README.postgresql
-cp %{SOURCE303} MIGRATION.fedora
+cp %{SOURCE303} MIGRATION.%{distro}
+
+# point the reader to the correct README filename
+sed -i 's/distro/%{distro}/g' README.%{distro}
 
 # Locate license files and put them sensibly in place
 # get rid of all composer licenses
@@ -421,7 +426,7 @@ if [ $1 -eq 0 ]; then
 fi
 
 %files
-%doc AUTHORS README.fedora MIGRATION.fedora config/config.sample.php
+%doc AUTHORS README.%{distro} MIGRATION.%{distro} config/config.sample.php
 %license *-LICENSE
 %dir %attr(-,apache,apache) %{_sysconfdir}/%{name}
 # contains sensitive data (dbpassword, passwordsalt)