diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 `fedora-dists` uses [PVP Versioning](https://pvp.haskell.org).
 
+## 2.1.1 (2022-05-24)
+epel-next fixes (juhp/fbrnch#29):
+- Branch: getFedoraBranches now includes epel-8-next and epel-9-next
+- Dist: fix rpmDistTag for epel-next
+
 ## 2.1.0 (2022-05-18)
 - add epel-next to Dist and Branch (juhp/fbrnch#29)
 - remove obsolete deps on bytestring and time
diff --git a/fedora-dists.cabal b/fedora-dists.cabal
--- a/fedora-dists.cabal
+++ b/fedora-dists.cabal
@@ -1,13 +1,13 @@
 cabal-version:       1.18
 name:                fedora-dists
-version:             2.1.0
+version:             2.1.1
 synopsis:            Library for Fedora distribution versions
 description:
             This library provides the Dist and Branch datatypes
             and various associated metadata functions for
             Red Hat distributions (Fedora, EPEL, RHEL) needed for
             packaging development and building.
-            It uses current releasedata from Fedora PDC.
+            It uses current release data from Fedora PDC.
 homepage:            https://github.com/juhp/fedora-dists
 bug-reports:         https://github.com/juhp/fedora-dists/issues
 license:             GPL-3
@@ -20,7 +20,7 @@
 extra-doc-files:     README.md
                    , CHANGELOG.md
 tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,
-                     GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7
+                     GHC == 8.6.5, GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2
 
 source-repository head
   type:                git
diff --git a/src/Distribution/Fedora.hs b/src/Distribution/Fedora.hs
--- a/src/Distribution/Fedora.hs
+++ b/src/Distribution/Fedora.hs
@@ -208,7 +208,7 @@
 rpmDistTag :: Dist -> String
 rpmDistTag (Fedora n) = ".fc" ++ show n
 rpmDistTag (EPEL n) = ".el" ++ show n
-rpmDistTag (EPELNext n) = ".el" ++ show n
+rpmDistTag (EPELNext n) = ".el" ++ show n ++ ".next"
 rpmDistTag (RHEL v) = ".el" ++ (show . head . versionBranch) v
 
 -- | Command line tool for `Dist` (eg "koji")
diff --git a/src/Distribution/Fedora/Branch.hs b/src/Distribution/Fedora/Branch.hs
--- a/src/Distribution/Fedora/Branch.hs
+++ b/src/Distribution/Fedora/Branch.hs
@@ -161,7 +161,11 @@
 
 -- | Returns list of active Fedora branches, including rawhide and EPEL
 getFedoraBranches :: IO [Branch]
-getFedoraBranches = map releaseBranch <$> Dist.getReleaseIds
+getFedoraBranches = do
+  -- FIXME get these from Bodhi Releases?
+  let epelnext = [EPELNext 8, EPELNext 9]
+  brs <- map releaseBranch <$> Dist.getReleaseIds
+  return $ brs ++ epelnext
 
 -- | Maps release-id to Branch
 releaseBranch :: T.Text -> Branch