diff --git a/Casks/emacs-app.rb b/Casks/emacs-app.rb
index 4ac82cbd..4b7a4877 100644
--- a/Casks/emacs-app.rb
+++ b/Casks/emacs-app.rb
@@ -22,7 +22,7 @@ cask 'emacs-app' do
     url 'https://github.com/jimeh/emacs-builds.git'
     strategy :git do |tags|
       tags.map do |tag|
-        m = /^Emacs-(\d+\.\d+[a-z]*)$/.match(tag)
+        m = /^Emacs-(\d+\.\d+[a-z]*(-.+)?)$/.match(tag)
         next unless m
 
         m[1]
diff --git a/templates/emacs-app.rb.tpl b/templates/emacs-app.rb.tpl
index b83f070f..a801c3d6 100644
--- a/templates/emacs-app.rb.tpl
+++ b/templates/emacs-app.rb.tpl
@@ -12,7 +12,7 @@ cask 'emacs-app' do
     url 'https://github.com/jimeh/emacs-builds.git'
     strategy :git do |tags|
       tags.map do |tag|
-        m = /^Emacs-(\d+\.\d+[a-z]*)$/.match(tag)
+        m = /^Emacs-(\d+\.\d+[a-z]*(-.+)?)$/.match(tag)
         next unless m
 
         m[1]