diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4be97b564a9..4203e05aed8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* Makefile.in (semantic): Simplify.
+
 2014-12-30  Juri Linkov  <juri@linkov.net>
 
 	* net/eww.el (eww-isearch-next-buffer): New function.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f22ca69996b..ba2a2292cbd 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -325,13 +325,8 @@ compile-clean:
 leim:
 	$(MAKE) -C ../leim all EMACS="$(EMACS)"
 
-# FIXME.  Yuck.
 semantic:
-	case ${EMACS} in \
-	  .*) EMACS="../${EMACS}" ;; \
-	   *) EMACS="${EMACS}" ;; \
-	esac; \
-	$(MAKE) -C ../admin/grammars all EMACS="$${EMACS}"
+	$(MAKE) -C ../admin/grammars all EMACS="$(EMACS:.%=../.%)"
 
 # Compile all Lisp files, but don't recompile those that are up to
 # date.  Some .el files don't get compiled because they set the