diff --git a/app-emacs/eglot/eglot-1.6.ebuild b/app-emacs/eglot/eglot-1.6-r1.ebuild
similarity index 94%
rename from app-emacs/eglot/eglot-1.6.ebuild
rename to app-emacs/eglot/eglot-1.6-r1.ebuild
index 913bb955411f6..b5463a817ab24 100644
--- a/app-emacs/eglot/eglot-1.6.ebuild
+++ b/app-emacs/eglot/eglot-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/eglot/eglot-1.8.ebuild b/app-emacs/eglot/eglot-1.8-r1.ebuild
similarity index 94%
rename from app-emacs/eglot/eglot-1.8.ebuild
rename to app-emacs/eglot/eglot-1.8-r1.ebuild
index 913bb955411f6..b5463a817ab24 100644
--- a/app-emacs/eglot/eglot-1.8.ebuild
+++ b/app-emacs/eglot/eglot-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/eglot/files/50eglot-gentoo.el b/app-emacs/eglot/files/50eglot-gentoo.el
index b8a7e2b65eedd..c3b894cc43c83 100644
--- a/app-emacs/eglot/files/50eglot-gentoo.el
+++ b/app-emacs/eglot/files/50eglot-gentoo.el
@@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/eglot-autoload.el")
+(load "@SITELISP@/eglot-autoload.el" nil t)