diff --git a/Makefile.am b/Makefile.am
index 655cb732..a24a5642 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
 AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \
 	-DLIBEXECDIR='"$(libexecdir)"' \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
+        -DRPM_OSTREE_FEATURES='"$(RPM_OSTREE_FEATURES)"' \
 	-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36
 AM_CFLAGS += $(WARN_CFLAGS)
 
diff --git a/configure.ac b/configure.ac
index d43ad848..22fa0768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,9 @@ AC_SUBST(WARN_CFLAGS)
 LT_PREREQ([2.2.4])
 LT_INIT([disable-static])
 
+RPM_OSTREE_FEATURES=""
+AC_SUBST([RPM_OSTREE_FEATURES])
+
 PKG_PROG_PKG_CONFIG
 
 save_LIBS="$LIBS"
@@ -58,6 +61,7 @@ AM_CONDITIONAL(BUILDOPT_PATCHED_HAWKEY_AND_LIBSOLV, [test x$enable_patched_hawke
 AS_IF([test x$enable_patched_hawkey_and_libsolv = xyes], [
     AC_DEFINE(HAVE_PATCHED_HAWKEY_AND_LIBSOLV, 1, [Define if we have patched hawkey and libsolv])
 ])
+if test x$enable_patched_hawkey_and_libsolv != xno; then RPM_OSTREE_FEATURES="$RPM_OSTREE_FEATURES +packaging"; fi
 
 AC_ARG_ENABLE(usrbinatomic,
               AS_HELP_STRING([--enable-usrbinatomic],
@@ -75,6 +79,7 @@ AM_CONDITIONAL(BUILDOPT_COMPOSE_TOOLING, [test x$enable_compose_tooling = xyes])
 AS_IF([test x$enable_compose_tooling = xyes], [
     AC_DEFINE(HAVE_COMPOSE_TOOLING, 1, [Define if we are building compose tooling])
 ])
+if test x$enable_compose_tooling != xno; then RPM_OSTREE_FEATURES="$RPM_OSTREE_FEATURES +compose"; fi
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/src/main.c b/src/main.c
index bec875ce..6d91c58e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -115,7 +115,7 @@ main (int    argc,
             }
           else if (cmd == NULL && g_str_equal (argv[in], "--version"))
             {
-              g_print ("%s\n  %s\n", PACKAGE_STRING, "");
+              g_print ("%s\n  %s\n", PACKAGE_STRING, RPM_OSTREE_FEATURES);
               return 0;
             }
           else if (cmd == NULL)