diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.51-r1.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.51-r2.ebuild
similarity index 100%
rename from app-emacs/ebuild-mode/ebuild-mode-1.51-r1.ebuild
rename to app-emacs/ebuild-mode/ebuild-mode-1.51-r2.ebuild
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
index c21721137e41c..7ce7e85141a91 100644
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
@@ -1,12 +1,15 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'ebuild-mode "ebuild-mode"
   "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'devbook-mode "devbook-mode"
+  "Major mode for editing the Gentoo Devmanual." t)
 (autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
   "Major mode for Gentoo GLEP 42 news items." t)
 (autoload 'glep-mode "glep-mode"
   "Major mode for Gentoo Linux Enhancement Proposals." t)
 
 (add-to-list 'auto-mode-alist '("\\.\\(ebuild\\|eclass\\)\\'" . ebuild-mode))
+(add-to-list 'auto-mode-alist '("/devmanual.*\\.xml\\'" . devbook-mode))
 (add-to-list 'auto-mode-alist
 	     '("/[0-9]\\{4\\}-[01][0-9]-[0-3][0-9]-.+\\.[a-z]\\{2\\}\\.txt\\'"
 	       . gentoo-newsitem-mode))