diff --git a/var/spack/repos/builtin/packages/lammps/package.py b/var/spack/repos/builtin/packages/lammps/package.py
index 1c933f21f3d..b3dda2ce37d 100644
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -108,6 +108,7 @@ def url_for_version(self, version):
         "dipole",
         "electrode",
         "granular",
+        "intel",
         "kspace",
         "kokkos",
         "latte",
@@ -146,6 +147,7 @@ def url_for_version(self, version):
         "user-eff",
         "user-fep",
         "user-h5md",
+        "user-intel",
         "user-lb",
         "user-manifold",
         "user-meamc",
@@ -486,6 +488,14 @@ def url_for_version(self, version):
         msg="+user-h5md was removed after @20210527, use +h5md instead",
     )
     conflicts("+h5md", when="@:20210527", msg="+h5md only added @20210702, use +user-h5md instead")
+    conflicts(
+        "+user-intel",
+        when="@20210702:",
+        msg="+user-intel was removed after @20210527, use +intel instead",
+    )
+    conflicts(
+        "+intel", when="@:20210527", msg="+intel only added @20210702, use +user-intel instead"
+    )
     conflicts(
         "+user-lb",
         when="@20210702:",