diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec
index 2447483..b247e29 100644
--- a/rpm/vo-client.spec
+++ b/rpm/vo-client.spec
@@ -5,7 +5,7 @@
 %define iam_vomses 0
 
 Name:           vo-client
-Version:        135
+Version:        136
 Release:        1%{?dist}
 Summary:        Contains vomses file for use with user authentication
 
@@ -62,6 +62,8 @@ sed -Ei '/.*voms-(alice|lhcb|ops)-auth.app.cern.ch.*/d' vomses
 %if ! 0%{?iam_vomses}
 # Additional entries from SOFTWARE-5843:
 sed -Ei '/.*voms-(alice|atlas|cms|dteam|lhcb)-auth.cern.ch.*/d' vomses
+# Additional entries from SOFTWARE-5861:
+sed -Ei '/"(alice|atlas|cms|lhcb)".*(lcg-)?voms2.cern.ch.*/d' vomses
 %endif
 
 %install
@@ -94,6 +96,9 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/grid-security/vomsdir -type d -exec chmod 75
 %config(noreplace) %{_datadir}/osg/grid-vorolemap
 
 %changelog
+* Mon May 06 2024 Matt Westphall <westphall@wisc.edu> - 136-1
+- Only include *-auth.app.cern.ch in vomses for new CERN IAM endpoints (SOFTWARE-5861)
+
 * Fri Mar 15 2024 Mátyás Selmeci <matyas@cs.wisc.edu> - 135-1
 - Add LSC files (only) for new CERN IAM endpoints (SOFTWARE-5843)
 
diff --git a/vomsdir/alice/lcg-voms2.cern.ch.lsc b/vomsdir/alice/lcg-voms2.cern.ch.lsc
new file mode 100644
index 0000000..6279707
--- /dev/null
+++ b/vomsdir/alice/lcg-voms2.cern.ch.lsc
@@ -0,0 +1,2 @@
+/DC=ch/DC=cern/OU=computers/CN=lcg-voms2.cern.ch
+/DC=ch/DC=cern/CN=CERN Grid Certification Authority
diff --git a/vomses b/vomses
index 254bc33..0244b6a 100644
--- a/vomses
+++ b/vomses
@@ -13,6 +13,7 @@
 "ops" "voms-ops-auth.app.cern.ch" "443" "/DC=ch/DC=cern/OU=computers/CN=ops-auth.web.cern.ch" "ops"
 "icecube" "grid-voms.desy.de" "15109" "/DC=org/DC=terena/DC=tcs/C=DE/ST=Hamburg/O=Deutsches Elektronen-Synchrotron DESY/CN=grid-voms.desy.de" "icecube"
 "alice" "voms2.cern.ch" "15000" "/DC=ch/DC=cern/OU=computers/CN=voms2.cern.ch" "alice"
+"atlas" "lcg-voms2.cern.ch" "15001" "/DC=ch/DC=cern/OU=computers/CN=lcg-voms2.cern.ch" "atlas"
 "alice" "voms-alice-auth.app.cern.ch" "443" "/DC=ch/DC=cern/OU=computers/CN=alice-auth.web.cern.ch" "alice"
 "Gluex" "gluex.phys.uconn.edu" "15014" "/DC=org/DC=incommon/C=US/ST=Connecticut/O=University of Connecticut/CN=gluex.phys.uconn.edu" "Gluex"
 "Gluex" "gryphn.phys.uconn.edu" "15014" "/DC=org/DC=incommon/C=US/ST=Connecticut/O=University of Connecticut/CN=gryphn.phys.uconn.edu" "Gluex"