diff --git a/Makefile-decls.am b/Makefile-decls.am
index e41586d1..06018594 100644
--- a/Makefile-decls.am
+++ b/Makefile-decls.am
@@ -30,6 +30,7 @@ sbin_PROGRAMS =
 bin_SCRIPTS =
 lib_LTLIBRARIES =
 libexec_PROGRAMS =
+pkglibexec_PROGRAMS =
 pkglibexec_SCRIPTS =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index e6b1eabe..d46fc225 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -102,12 +102,14 @@ src/ostree/parse-datetime.c: src/ostree/parse-datetime.y Makefile
 EXTRA_DIST += src/ostree/parse-datetime.y
 CLEANFILES += src/ostree/parse-datetime.c
 
-ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree \
-	$(NULL)
-ostree_bin_shared_ldadd = libglnx.la libbsdiff.la libotutil.la libostree-kernel-args.la libostree-1.la
+ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \
+	-I$(srcdir)/src/ostree -I$(srcdir)/libglnx $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+ostree_bin_shared_ldadd = $(AM_LDFLAGS) libglnx.la libotutil.la libostree-1.la \
+	$(OT_INTERNAL_GIO_UNIX_LIBS)
+
+ostree_CFLAGS = $(ostree_bin_shared_cflags)
+ostree_LDADD = $(ostree_bin_shared_ldadd) libbsdiff.la libostree-kernel-args.la $(LIBSYSTEMD_LIBS)
 
-ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/libglnx
-ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS) $(LIBSYSTEMD_LIBS)
 
 if USE_LIBSOUP
 ostree_SOURCES += \