diff --git a/.gitignore b/.gitignore
index 1adb397a6..daf3db7fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ config.h
 config.h.in
 config.h.win32
 config.log
+config.lt
 config.status
 configure
 depcomp
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 5dee0988d..80d3b09af 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -554,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums
 
 lib_LTLIBRARIES += libcogl.la
 
-libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 if !USE_GLIB
 libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la
 libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la
diff --git a/configure.ac b/configure.ac
index 3e9742b48..a25434878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,12 @@ dnl when using libtool 2.x create libtool early, because it's used in the
 dnl internal glib configure (as-glibconfig.m4)
 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 
+dnl ================================================================
+dnl Find an appropriate libm, for sin() etc.
+dnl ================================================================
+LT_LIB_M
+AC_SUBST(LIBM)
+
 dnl ================================================================
 dnl See what platform we are building for
 dnl ================================================================