diff --git a/configure.ac b/configure.ac
index aa238c65e77e6eb998b5eb4474050416713e68fa..f36181368c08eee30104c358a2e01cf6dd9047cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@
 
 dnl Prologue
 dnl
-AC_INIT
+
+AC_INIT(slurm, m4_esyscmd_s([perl -ne 'print,exit if s/^\s*VERSION:\s*(\S*).*/\1/i' ./META]), [slurm-dev@schedmd.com], [], [http://slurm.schedmd.com])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR([auxdir])
@@ -14,15 +15,13 @@ AM_CONDITIONAL(DONT_BUILD, test "1" = "0")
 
 X_AC_GPL_LICENSED
 
-#
 # Determine project/version from META file.
 # Sets PACKAGE, VERSION, SLURM_VERSION
 X_AC_SLURM_VERSION
 
-
 dnl Initialize Automake
 dnl
-AM_INIT_AUTOMAKE(slurm, $VERSION)
+AM_INIT_AUTOMAKE(no-define)
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([slurm/slurm.h])
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index c4f1e7bccb04a8491aacaaff20b2405f7bd730db..4da1743266049d9181bf33e51f84426e6f523385 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -152,7 +152,7 @@ libslurm_o_LDADD = $(top_builddir)/src/common/libeio.o	\
 	$(top_builddir)/src/common/libspank.o	\
 	$(top_builddir)/src/common/libcommon.o
 
-libslurm.o: $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
+libslurm.o$(EXEEXT): $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
 	$(LINK) $(libslurmhelper_la_OBJECTS) $(libslurm_o_LDADD)
 
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a0d6325328c0d2b84193f2ac67043e05e5311df7..c899718f2ed56473a2f8dba582812f43eaa6d701 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -150,19 +150,19 @@ libcommon_la_LDFLAGS  = $(HWLOC_LDFLAGS) $(LIB_LDFLAGS) -module --export-dynamic
 # This was made so we could export all symbols from libcommon
 # on multiple platforms
 libcommon_o_SOURCES =
-libcommon.o :  $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
+libcommon.o$(EXEEXT) :  $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES)
 	$(LINK)  $(libcommon_la_OBJECTS)
 
 # This was made so we could export all symbols from libeio
 # on multiple platforms
 libeio_o_SOURCES =
-libeio.o :  $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
+libeio.o$(EXEEXT) :  $(libeio_la_OBJECTS) $(libeio_la_DEPENDENCIES)
 	$(LINK)  $(libeio_la_OBJECTS)
 
 # This was made so we could export all symbols from libspank
 # on multiple platforms
 libspank_o_SOURCES =
-libspank.o :  $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
+libspank.o$(EXEEXT) :  $(libspank_la_OBJECTS) $(libspank_la_DEPENDENCIES)
 	$(LINK)  $(libspank_la_OBJECTS)
 
 
diff --git a/src/common/proc_args.c b/src/common/proc_args.c
index b65fa5385978e118dae278f1e3084196489eeac9..f040cf9d550c9593a214765605cd4edb3534faf1 100644
--- a/src/common/proc_args.c
+++ b/src/common/proc_args.c
@@ -85,7 +85,7 @@
 /* print this version of SLURM */
 void print_slurm_version(void)
 {
-	printf("%s %s\n", PACKAGE, SLURM_VERSION_STRING);
+	printf("%s\n", PACKAGE_STRING);
 }
 
 /* print the available gres options */
diff --git a/src/db_api/Makefile.am b/src/db_api/Makefile.am
index 246a6c6c670ce976f15e68ba9052f9c8a2d52969..44ebfd03e9da93bf9ed3d733b2e2046cdc55c945 100644
--- a/src/db_api/Makefile.am
+++ b/src/db_api/Makefile.am
@@ -83,7 +83,7 @@ libslurmdb_o_SOURCES =
 
 libslurmdb_o_LDADD = $(top_builddir)/src/api/libslurm.o
 
-libslurmdb.o: $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
+libslurmdb.o$(EXEEXT): $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
 	$(LINK) $(libslurmdb_la_OBJECTS) $(libslurmdb_o_LDADD)
 
 force: