diff --git a/configure.ac b/configure.ac
index 429783c..b92c8a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 dnl
 dnl autoconf for ipmitool
 dnl
-AC_INIT([src/ipmitool.c])
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([ipmitool], [1.8.16-cvs])
-AM_CONFIG_HEADER(config.h)
+AC_INIT([ipmitool], [1.8.16-cvs])
 AC_CONFIG_SRCDIR([src/ipmitool.c])
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.50)
 AC_SUBST(ac_configure_args)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a5ebb48..359cb30 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,6 +28,7 @@
 # LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
 # EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
+AUTOMAKE_OPTIONS		= subdir-objects
 AM_CPPFLAGS			= -I$(top_srcdir)/include
 MAINTAINERCLEANFILES		= Makefile.in