diff --git a/THANKS b/THANKS
index 3437e808..7254bb3f 100644
--- a/THANKS
+++ b/THANKS
@@ -84,6 +84,7 @@ Juan Manuel Guerrero      juan.guerrero@gmx.de
 Kees Zeelenberg           kzlg@users.sourceforge.net
 Keith Browne              kbrowne@legato.com
 Ken Moffat                zarniwhoop@ntlworld.com
+Kiyoshi Kanazawa          yoi_no_myoujou@yahoo.co.jp
 Laurent Mascherpa         laurent.mascherpa@epita.fr
 Lie Yan                   lie.yan@kaust.edu.sa
 Magnus Fromreide          magfr@lysator.liu.se
diff --git a/lib/local.mk b/lib/local.mk
index aec635a8..18c0953d 100644
--- a/lib/local.mk
+++ b/lib/local.mk
@@ -45,15 +45,6 @@ lib_libbison_a_SOURCES +=                       \
   lib/path-join.h                               \
   lib/path-join.c
 
-lib_libbison_a_LIBADD +=                        \
-  $(ISNAND_LIBM)                                \
-  $(ISNANF_LIBM)                                \
-  $(ISNANL_LIBM)                                \
-  $(LDEXPL_LIBM)                                \
-  $(LDEXP_LIBM)                                 \
-  $(LIB_CLOCK_GETTIME)                          \
-  $(LIB_GETHRXTIME)
-
 # The Yacc compatibility library.
 if ENABLE_YACC
   lib_LIBRARIES = lib/liby.a
diff --git a/src/local.mk b/src/local.mk
index 0651aac1..6d5adfd9 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -104,9 +104,19 @@ BUILT_SOURCES +=                                \
   src/scan-gram.c                               \
   src/scan-skel.c
 
+# Although conceptually most of these guys would make more sense in the
+# definition of libbison, beware that they might expand as flags such as
+# `-lm`.  Keep them here.  Or use a Libtool convenience library.
 src_bison_LDADD =                               \
+  $(ISNAND_LIBM)                                \
+  $(ISNANF_LIBM)                                \
+  $(ISNANL_LIBM)                                \
+  $(LDEXPL_LIBM)                                \
+  $(LDEXP_LIBM)                                 \
   $(LIBINTL)                                    \
   $(LIBTHREAD)                                  \
+  $(LIB_CLOCK_GETTIME)                          \
+  $(LIB_GETHRXTIME)                             \
   lib/libbison.a