diff --git a/wmbattery/ChangeLog b/wmbattery/ChangeLog
index bdbae3e..1876f4f 100644
--- a/wmbattery/ChangeLog
+++ b/wmbattery/ChangeLog
@@ -1,3 +1,16 @@
+wmbattery (2.47)
+  * Avoid redefinition of apm_read/apm_exists in *BSD.
+    The two functions are defined if the BSD-specific apm headers are found and
+    if libapm is not found.  Both of these conditions will be true on BSD
+    systems, so we use #elif instead of the separate #if statements.
+  * Use AC_CHECK_LIB instead of AC_CHECK_HEADERS to check for libapm.
+    If autoconf finds an apm.h other than the one belonging to libapm, we get
+    builds errors like the ones reported by Haroldo Gambini Santos in [1].
+
+    [1] http://lists.windowmaker.org/dev/msg07937.html
+
+ -- Doug Torrance <dtorrance@monmouthcollege.edu>  Thu, 19 Feb 2015 23:26:34 -0600
+
 wmbattery (2.46)
   * Make it possible to work without libapm as libapm and apm.h are not
     necessarily available on Linux.
diff --git a/wmbattery/configure.ac b/wmbattery/configure.ac
index 0d9b57b..5bfa487 100644
--- a/wmbattery/configure.ac
+++ b/wmbattery/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(wmbattery.c, 2.46)
+AC_INIT(wmbattery.c, 2.47)
 AC_CONFIG_HEADER(config.h)
 
 AC_CONFIG_AUX_DIR(autoconf)