diff --git a/var/spack/repos/builtin/packages/upp/package.py b/var/spack/repos/builtin/packages/upp/package.py
index 1bb12e2a27..3cef205afd 100644
--- a/var/spack/repos/builtin/packages/upp/package.py
+++ b/var/spack/repos/builtin/packages/upp/package.py
@@ -19,28 +19,21 @@ class Upp(CMakePackage):
 
     maintainers("AlexanderRichert-NOAA", "edwardhartnett", "Hang-Lei-NOAA")
 
+    version("develop", branch="develop")
+    version("11.0.0", tag="upp_v11.0.0", submodules=True)
     version("10.0.10", sha256="0c96a88d0e79b554d5fcee9401efcf4d6273da01d15e3413845274f73d70b66e")
-    version(
-        "10.0.9",
-        tag="upp_v10.0.9",
-        commit="a49af0549958def4744cb3903c7315476fe44530",
-        submodules=True,
-    )
-    version(
-        "10.0.8",
-        tag="upp_v10.0.8",
-        commit="ce989911a7a09a2e2a0e61b3acc87588b5b9fc26",
-        submodules=True,
-    )
+    version("10.0.9", tag="upp_v10.0.9", submodules=True)
+    version("10.0.8", tag="upp_v10.0.8", submodules=True)
+    version("8.2.0", sha256="38de2178dc79420f42aa3fb8b85796fc49d43d66f90e5276e47ab50c282627ac")
 
     variant("openmp", default=True, description="Use OpenMP threading")
     variant("postexec", default=True, description="Build NCEPpost executable")
-    variant("wrf-io", default=False, description="Build NCEPpost with WRF-IO library")
-    variant("docs", default=False, description="Enable generation of doxygen-based documentation")
+    variant("wrf-io", default=False, description="Build with WRF-IO library")
+    variant("docs", default=False, description="Build Doxygen documentation")
 
     depends_on("mpi")
     depends_on("netcdf-fortran")
-    depends_on("bacio")
+    depends_on("bacio@2.4.1")
     depends_on("crtm")
     depends_on("g2")
     depends_on("g2tmpl")