diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c29853e..b96f30ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,12 +8,18 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 
  * Add `php-topsy-beginning-of-defun-with-class` to display classname with function signature. ([#766])
 
+### Fixed
+
+ * Fixed build failure in Emacs on master branch ([#764], [#767])
+
 ### Removed
 
  * Removed Phan-specific features from `php-project` ([#754])
 
 [#754]: https://github.com/emacs-php/php-mode/pull/754
+[#764]: https://github.com/emacs-php/php-mode/issues/764
 [#766]: https://github.com/emacs-php/php-mode/pull/766
+[#767]: https://github.com/emacs-php/php-mode/pull/767
 
 ## [1.25.0] - 2023-07-24
 
diff --git a/lisp/php-flymake.el b/lisp/php-flymake.el
index a3650dad..a55a22a8 100644
--- a/lisp/php-flymake.el
+++ b/lisp/php-flymake.el
@@ -26,8 +26,9 @@
 
 ;;; Code:
 (require 'flymake)
-(require 'flymake-proc)
 (require 'cl-lib)
+(eval-and-compile
+  (require 'flymake-proc))
 (eval-when-compile
   (require 'pcase)
   (require 'rx))