diff --git a/.gitignore b/.gitignore
index 4a34745..c468989 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,4 @@
 /test/*.trs
 /ipmiwhitelist.cpp
 /sensor-gen.cpp
+/inventory-sensor-gen.cpp
diff --git a/Makefile.am b/Makefile.am
index 2a51d2f..e0412b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
 ipmid_SOURCES = \
 	ipmid.cpp
 nodist_ipmid_SOURCES = ipmiwhitelist.cpp
-BUILT_SOURCES = ipmiwhitelist.cpp sensor-gen.cpp
+BUILT_SOURCES = ipmiwhitelist.cpp sensor-gen.cpp inventory-sensor-gen.cpp
 CLEANFILES = $(BUILT_SOURCES)
 
 #TODO - Make this path a configure option (bitbake parameter)
@@ -21,6 +21,9 @@
 sensor-gen.cpp:
 	$(AM_V_GEN)@SENSORGEN@ -o $(top_builddir) generate-cpp
 
+inventory-sensor-gen.cpp:
+	$(AM_V_GEN)@INVSENSORGEN@ -o $(top_builddir) generate-cpp
+
 libapphandlerdir = ${libdir}/ipmid-providers
 libapphandler_LTLIBRARIES = libapphandler.la
 libapphandler_la_SOURCES = \
@@ -35,7 +38,8 @@
 	globalhandler.cpp \
 	groupext.cpp \
 	sensor-gen.cpp \
-	utils.cpp
+	utils.cpp \
+	inventory-sensor-gen.cpp
 
 libapphandler_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) $(PHOSPHOR_LOGGING_LIBS) $(PHOSPHOR_DBUS_INTERFACES_LIBS) -version-info 0:0:0 -shared
 libapphandler_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS) $(PHOSPHOR_LOGGING_CFLAGS) $(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 1134046..4f534df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,10 @@
 SENSORGEN="$PYTHON ${srcdir}/scripts/sensor_gen.py -i $SENSOR_YAML_GEN"
 AC_SUBST(SENSORGEN)
 
+AS_IF([test "x$INVSENSOR_YAML_GEN" == "x"], [INVSENSOR_YAML_GEN="inventory-sensor-example.yaml"])
+INVSENSORGEN="$PYTHON ${srcdir}/scripts/inventory-sensor.py -i $INVSENSOR_YAML_GEN"
+AC_SUBST(INVSENSORGEN)
+
 # Soft Power off related.
 AS_IF([test "x$enable_softoff" != "xno"],
     # Dbus service name