diff --git a/aqua/emacs-mac-app/Portfile b/aqua/emacs-mac-app/Portfile
index 8c84b0c1108c0..c0cd13207fc44 100644
--- a/aqua/emacs-mac-app/Portfile
+++ b/aqua/emacs-mac-app/Portfile
@@ -10,7 +10,7 @@ bitbucket.setup     mituharu emacs-mac emacs-${emacs_version}-mac-${emacs_mac_ve
 name                emacs-mac-app
 conflicts           emacs-app emacs-app-devel
 version             ${emacs_mac_ver}
-revision            3
+revision            4
 categories          aqua editors
 maintainers         {amake @amake} openmaintainer
 
@@ -102,7 +102,7 @@ subport ${name}-devel {
     set date            2025-09-20
 
     version         [string map {- {}} ${date}]
-    revision        1
+    revision        2
 
     long_description \
         ${name} is the \"Mac port\" of GNU Emacs ${emacs_version}. \
@@ -177,6 +177,9 @@ variant treesitter description {Builds emacs with tree-sitter support} {
     configure.args-append   --with-tree-sitter
     depends_lib-append  port:tree-sitter
 
+    # TODO: This will become unnecessary in Emacs 31
+    configure.cflags-append -Dts_language_version=ts_language_abi_version
+
     lappend rpaths ${prefix}/lib
 
     depends_run-append \
diff --git a/editors/emacs/Portfile b/editors/emacs/Portfile
index 5fac6f2f8612f..94aac9e6a5de5 100644
--- a/editors/emacs/Portfile
+++ b/editors/emacs/Portfile
@@ -124,7 +124,7 @@ platform darwin {
 
 if {$subport eq $name || $subport eq "emacs-app"} {
     version         30.2
-    revision        3
+    revision        4
     checksums       rmd160  fefdd3fcd453d733114f609a3e122b2529cc7410 \
                     sha256  1d79a4ba4d6596f302a7146843fe59cf5caec798190bcc07c907e7ba244b076d \
                     size    83059014
@@ -137,17 +137,17 @@ if {$subport eq "emacs-devel" || $subport eq "emacs-app-devel"} {
 
     # do not forget to check that configure hasn't introduce some suprises via
     # git diff [old]..[new] -- '**/configure.ac'
-    github.setup    emacs-mirror emacs db3d6f06c389e06922964fb4869d19ba9040c16e
+    github.setup    emacs-mirror emacs 7ce60be53e7ffbc1972dd8e98744adf6103eee9e
     github.tarball_from archive
     epoch           5
-    version         20250924
-    revision        1
+    version         20260406
+    revision        0
 
     master_sites    ${github.master_sites}
 
-    checksums       rmd160  591d36fc54fc696d35e026f6d8a80d0230ed1394 \
-                    sha256  664d4fa8443c884ecbbddebfc799f9142dada9911eaff7b0fb116a4b0c63c2fe \
-                    size    52379510
+    checksums       rmd160  6496eb0f56b2250840049c249dea73310feb9244 \
+                    sha256  4dc00f6615292c0d6fccd330260bf2b06abbe84d4a27c469be8a914c0faa1ed5 \
+                    size    53052187
 
     livecheck.type none
 
@@ -309,6 +309,11 @@ variant treesitter description {Builds emacs with tree-sitter support} {
     configure.args-append   --with-tree-sitter
     depends_lib-append      port:tree-sitter
 
+    # TODO: This will become unnecessary in Emacs 31
+    if {$subport eq $name || $subport eq "emacs-app"} {
+        configure.cflags-append -Dts_language_version=ts_language_abi_version
+    }
+
     if {$subport eq "emacs-app" || $subport eq "emacs-app-devel"} {
         lappend rpaths ${prefix}/lib
     }