diff --git a/Makefile-tests.am b/Makefile-tests.am
index fb090893..65abb165 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -64,7 +64,7 @@ check-local:
 	@echo "  *** NOTE ***"
 	@echo "  *** NOTE ***"
 	@echo " \"make check\" only runs a subset of rpm-ostree's tests."
-	@echo " The other tests use: use https://live.gnome.org/GnomeGoals/InstalledTests"
-	@echo " To run them, ostree must be configured with --enable-installed-tests and installed"
+	@echo " The other tests use https://live.gnome.org/GnomeGoals/InstalledTests"
+	@echo " To run them, rpm-ostree must be configured with --enable-installed-tests and installed"
 	@echo "  *** NOTE ***"
 	@echo "  *** NOTE ***"
diff --git a/Makefile.am b/Makefile.am
index 1b65900a..c0bad761 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,6 @@ if ENABLE_GTK_DOC
 SUBDIRS += doc
 endif
 
-privdatadir=$(pkglibdir)
-
 ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
 AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \
 	-DLIBEXECDIR='"$(libexecdir)"' \
@@ -48,7 +46,7 @@ include $(INTROSPECTION_MAKEFILE)
 GIRS =
 TYPELIBS = $(GIRS:.gir=.typelib)
 
-include libglnx/Makefile-libglnx.am
+include libglnx/Makefile-libglnx.am.inc
 noinst_LTLIBRARIES += libglnx.la
 include Makefile-libpriv.am
 include Makefile-lib.am
diff --git a/autogen.sh b/autogen.sh
index f25acafd..8e598c51 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,16 +7,14 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd $srcdir
 
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-        echo "*** No autoreconf found, please intall it ***"
+if ! which autoreconf 2>/dev/null; then
+        echo "*** No autoreconf found, please install it ***"
         exit 1
 fi
 
 mkdir -p m4
 
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
+if ! which gtkdocize 2>/dev/null; then
         echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
         rm -f gtk-doc.make
         cat > gtk-doc.make <<EOF
diff --git a/configure.ac b/configure.ac
index f950e714..b448fc50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz subdir-objects])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 AC_USE_SYSTEM_EXTENSIONS