diff --git a/.gitignore b/.gitignore
index 602baba..378eac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,52 +1 @@
-# Template from:
-# https://github.com/github/gitignore/blob/master/Autotools.gitignore
-
-# http://www.gnu.org/software/automake
-
-Makefile.in
-/ar-lib
-/mdate-sh
-/py-compile
-/test-driver
-/ylwrap
-
-# http://www.gnu.org/software/autoconf
-
-/autom4te.cache
-/aclocal.m4
-/compile
-/config.guess
-/config.h.in
-/config.sub
-/configure
-/configure.scan
-/depcomp
-/install-sh
-/missing
-/stamp-h1
-
-# https://www.gnu.org/software/libtool/
-
-/ltmain.sh
-
-# http://www.gnu.org/software/texinfo
-
-/texinfo.tex
-
-# Repo Specific Items
-*.o
-*.trs
-/config.h
-/config.h.in~
-*.log
-/config.status
-/openpower-update-manager
-Makefile
-.deps
-*-libtool
-/test/utest
-/m4/*.m4
-/openpower-pnor-msl
-/org/openbmc/Associations/
-.dirstamp
-
+build
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100755
index a2f65be..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-AM_DEFAULT_SOURCE_EXT = .cpp
-
-ACLOCAL_AMFLAGS = -Im4
-
-dist_bin_SCRIPTS =
-
-bin_PROGRAMS = \
-	openpower-update-manager \
-	openpower-pnor-msl
-
-openpower_update_manager_SOURCES = \
-	activation.cpp \
-	functions.cpp \
-	version.cpp \
-	item_updater.cpp \
-	item_updater_main.cpp \
-	utils.cpp
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-	op-pnor-msl.service \
-	org.open_power.Software.Host.Updater.service
-endif
-
-if UBIFS_LAYOUT
-include ubi/Makefile.am.include
-else
-if MMC_LAYOUT
-include mmc/Makefile.am.include
-else
-include static/Makefile.am.include
-if HAVE_SYSTEMD
-  systemdsystemunit_DATA += \
-    openpower-pnor-update@.service
-endif
-endif
-endif
-
-if WANT_SIGNATURE_VERIFY_BUILD
-openpower_update_manager_SOURCES += \
-	image_verify.cpp
-endif
-
-if VIRTUAL_PNOR_ENABLED
-include vpnor/Makefile.am.include
-endif
-
-openpower_pnor_msl_SOURCES = \
-	msl_verify.cpp \
-	msl_verify_main.cpp
-
-generic_cxxflags = \
-	$(SYSTEMD_CFLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SDEVENTPLUS_CFLAGS) \
-	$(PHOSPHOR_LOGGING_CFLAGS) \
-	-flto
-generic_ldflags = \
-	$(SYSTEMD_LIBS) \
-	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-	$(SDBUSPLUS_LIBS) \
-	$(SDEVENTPLUS_LIBS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	-lssl \
-	-lcrypto
-
-openpower_update_manager_CXXFLAGS = $(generic_cxxflags)
-openpower_update_manager_LDFLAGS = $(generic_ldflags)
-openpower_pnor_msl_CXXFLAGS = $(generic_cxxflags)
-openpower_pnor_msl_LDFLAGS = $(generic_ldflags)
-
-SUBDIRS = test
diff --git a/README.md b/README.md
index 5e94931..e8747b8 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,9 @@
 [Host Code Update](https://github.com/openbmc/docs/blob/master/code-update/host-code-update.md)
 
 ## To Build
-```
 To build this package, do the following steps:
 
-    1. ./bootstrap.sh
-    2. ./configure ${CONFIGURE_FLAGS}
-    3. make
+1. `meson build`
+2. `ninja -C build`
 
-To clean the repository run `./bootstrap.sh clean`.
-```
+To clean the repository run `rm -r build`.
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 6b3c8b9..0000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -xe
-
-AUTOCONF_FILES="Makefile.in aclocal.m4 ar-lib autom4te.cache compile \
-        config.guess config.h.in config.sub configure depcomp install-sh \
-        ltmain.sh missing *libtool test-driver"
-
-case $1 in
-    clean)
-        test -f Makefile && make maintainer-clean
-        for file in ${AUTOCONF_FILES}; do
-            find . -name "$file" -print0 | xargs -0 -r rm -rf
-        done
-        exit 0
-        ;;
-esac
-
-autoreconf -i
-# shellcheck disable=SC2016
-echo 'Run "./configure ${CONFIGURE_FLAGS} && make"'
diff --git a/configure.ac b/configure.ac
deleted file mode 100755
index 3b6479c..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,209 +0,0 @@
-AC_PREREQ([2.69])
-AC_INIT([openpower-pnor-code-mgmt], [1.0], [https://github.com/openbmc/openpower-pnor-code-mgmt/issues])
-AC_LANG([C++])
-AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
-AM_SILENT_RULES([yes])
-
-AC_CONFIG_MACRO_DIRS([m4])
-
-# Checks for programs
-AC_PROG_CXX
-AC_PROG_INSTALL #Checks/sets the install variable to be used
-AC_PROG_MAKE_SET
-
-# Check for libraries
-PKG_CHECK_MODULES([PHOSPHOR_DBUS_INTERFACES], [phosphor-dbus-interfaces])
-PKG_CHECK_MODULES([SDBUSPLUS], [sdbusplus])
-PKG_CHECK_MODULES([SDEVENTPLUS], [sdeventplus])
-PKG_CHECK_MODULES([PHOSPHOR_LOGGING], [phosphor-logging])
-
-# Check for headers
-AC_CHECK_HEADERS([CLI/CLI.hpp], [], [AC_MSG_ERROR([CLI11 is required and was not found])])
-
-# Checks for library functions
-LT_INIT # Required for systemd linking
-
-PKG_PROG_PKG_CONFIG
-AC_ARG_WITH([systemdsystemunitdir],
-     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
-     [with_systemdsystemunitdir=auto])
-AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
-     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-
-     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
-   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
-    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
-    with_systemdsystemunitdir=no],
-   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
-AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
-      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
-
-# Check/set gtest specific functions.
-AX_PTHREAD([GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"],[GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"])
-AC_SUBST(GTEST_CPPFLAGS)
-AC_ARG_ENABLE([oe-sdk],
-    AS_HELP_STRING([--enable-oe-sdk], [Link testcases absolutely against OE SDK so they can be ran within it.])
-)
-AC_ARG_VAR(OECORE_TARGET_SYSROOT,
-    [Path to the OE SDK SYSROOT])
-AS_IF([test "x$enable_oe_sdk" == "xyes"],
-    AS_IF([test "x$OECORE_TARGET_SYSROOT" == "x"],
-          AC_MSG_ERROR([OECORE_TARGET_SYSROOT must be set with --enable-oe-sdk])
-    )
-    AC_MSG_NOTICE([Enabling OE-SDK at $OECORE_TARGET_SYSROOT])
-    [
-        testcase_flags="-Wl,-rpath,\${OECORE_TARGET_SYSROOT}/lib"
-        testcase_flags="${testcase_flags} -Wl,-rpath,\${OECORE_TARGET_SYSROOT}/usr/lib"
-        testcase_flags="${testcase_flags} -Wl,-dynamic-linker,`find \${OECORE_TARGET_SYSROOT}/lib/ld-*.so | sort -r -n | head -n1`"
-    ]
-    AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
-)
-
-# Checks for typedefs, structures, and compiler characteristics.
-AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
-AX_APPEND_COMPILE_FLAGS([-Wall -Werror], [CXXFLAGS])
-
-AC_ARG_VAR(SOFTWARE_OBJPATH, [The software manager Dbus root])
-AS_IF([test "x$SOFTWARE_OBJPATH" == "x"], [SOFTWARE_OBJPATH="/xyz/openbmc_project/software"])
-AC_DEFINE_UNQUOTED([SOFTWARE_OBJPATH], ["$SOFTWARE_OBJPATH"], [The software manager Dbus root])
-
-AC_DEFINE(ACTIVATION_FWD_ASSOCIATION, "inventory", [The name of the activation's forward association.])
-AC_DEFINE(ACTIVATION_REV_ASSOCIATION, "activation", [The name of the activation's reverse association.])
-AC_DEFINE(HOST_INVENTORY_PATH, "/xyz/openbmc_project/inventory/system/chassis", [The host inventory path.])
-
-AC_DEFINE(ACTIVE_FWD_ASSOCIATION, "active", [The name of the active's forward association.])
-AC_DEFINE(ACTIVE_REV_ASSOCIATION, "software_version", [The name of the active's reverse association.])
-
-AC_DEFINE(UPDATEABLE_FWD_ASSOCIATION, "updateable", [The name of the updateable forward association.])
-AC_DEFINE(UPDATEABLE_REV_ASSOCIATION, "software_version", [The updateable reverse association.])
-
-AC_DEFINE(FUNCTIONAL_FWD_ASSOCIATION, "functional", [The name of the functional forward association.])
-AC_DEFINE(FUNCTIONAL_REV_ASSOCIATION, "software_version", [The functional reverse association.])
-
-AC_DEFINE(VERSION_IFACE, "xyz.openbmc_project.Software.Version",
-    [The software version manager interface])
-AC_DEFINE(FILEPATH_IFACE, "xyz.openbmc_project.Common.FilePath",
-    [The common file path interface])
-
-AC_DEFINE(BUSNAME_UPDATER, "org.open_power.Software.Host.Updater",
-    [The item updater DBus busname to own.])
-
-AC_ARG_VAR(IMG_DIR, [Directory where downloaded or uploaded software images are placed and extracted])
-AS_IF([test "x$IMG_DIR" == "x"], [IMG_DIR="/tmp/images"])
-AC_DEFINE_UNQUOTED([IMG_DIR], ["$IMG_DIR"], [Directory where downloaded or uploaded software images are placed and extracted])
-
-AC_ARG_VAR(MANIFEST_FILE, [The path to the MANIFEST file])
-AS_IF([test "x$MANIFEST_FILE" == "x"], [MANIFEST_FILE="MANIFEST"])
-AC_DEFINE_UNQUOTED([MANIFEST_FILE], ["$MANIFEST_FILE"], [The path to the MANIFEST file])
-
-AC_ARG_VAR(PUBLICKEY_FILE_NAME, [The name of the public key file])
-AS_IF([test "x$PUBLICKEY_FILE_NAME" == "x"], [PUBLICKEY_FILE_NAME="publickey"])
-AC_DEFINE_UNQUOTED([PUBLICKEY_FILE_NAME], ["$PUBLICKEY_FILE_NAME"], [The name of the public key file])
-
-AC_ARG_VAR(HASH_FILE_NAME, [Hash file name])
-AS_IF([test "x$HASH_FILE_NAME" == "x"], [HASH_FILE_NAME="hashfunc"])
-AC_DEFINE_UNQUOTED([HASH_FILE_NAME], ["$HASH_FILE_NAME"], [The name of the hash file])
-
-AC_ARG_VAR(PNOR_SIGNED_IMAGE_CONF_PATH, [Path of PNOR image public key and hash function files])
-AS_IF([test "x$PNOR_SIGNED_IMAGE_CONF_PATH" == "x"], [PNOR_SIGNED_IMAGE_CONF_PATH="/etc/activationdata/"])
-AC_DEFINE_UNQUOTED([PNOR_SIGNED_IMAGE_CONF_PATH], ["$PNOR_SIGNED_IMAGE_CONF_PATH"], [Path of PNOR image public key and hash function files])
-
-AC_ARG_VAR(SIGNATURE_FILE_EXT, [The extension of the Signature file])
-AS_IF([test "x$SIGNATURE_FILE_EXT" == "x"], [SIGNATURE_FILE_EXT=".sig"])
-AC_DEFINE_UNQUOTED([SIGNATURE_FILE_EXT], ["$SIGNATURE_FILE_EXT"], [The extension of the Signature file])
-
-# setup signature verification
-AC_ARG_ENABLE([verify_pnor_signature],
-    AS_HELP_STRING([--enable-verify_pnor_signature], [Enable image signature validation.]))
-AS_IF([test "x$enable_verify_pnor_signature" == "xyes"], \
-    [AC_DEFINE([WANT_SIGNATURE_VERIFY],[],[Enable image signature validation.])])
-AM_CONDITIONAL([WANT_SIGNATURE_VERIFY_BUILD], [test "x$enable_verify_pnor_signature" == "xyes"])
-
-# setup virtual pnor support
-AC_ARG_ENABLE([virtual-pnor],
-    AS_HELP_STRING([--enable-virtual-pnor], [Enable support for virtual pnor])
-)
-AM_CONDITIONAL([VIRTUAL_PNOR_ENABLED], [test "x$enable_virtual_pnor" == "xyes"])
-
-AC_DEFINE(CHASSIS_STATE_PATH, "/xyz/openbmc_project/state/chassis0",
-    [The chassis state path.])
-AC_DEFINE(CHASSIS_STATE_OBJ, "xyz.openbmc_project.State.Chassis",
-    [The chassis state interface.])
-AC_DEFINE(CHASSIS_STATE_OFF, "xyz.openbmc_project.State.Chassis.PowerState.Off",
-    [The chassis state off property value.])
-
-AC_DEFINE(MAPPER_BUSNAME, "xyz.openbmc_project.ObjectMapper",
-    [The object mapper busname.])
-AC_DEFINE(MAPPER_PATH, "/xyz/openbmc_project/object_mapper",
-    [The object mapper path.])
-AC_DEFINE(MAPPER_INTERFACE, "xyz.openbmc_project.ObjectMapper",
-    [The object mapper interface.])
-
-AC_DEFINE(SYSTEMD_BUSNAME, "org.freedesktop.systemd1",
-    [systemd busname.])
-AC_DEFINE(SYSTEMD_PATH, "/org/freedesktop/systemd1",
-    [systemd path.])
-AC_DEFINE(SYSTEMD_INTERFACE, "org.freedesktop.systemd1.Manager",
-    [systemd interface.])
-AC_DEFINE(SYSTEMD_PROPERTY_INTERFACE, "org.freedesktop.DBus.Properties",
-    [systemd properties interface.])
-AC_DEFINE(ASSOCIATIONS_INTERFACE, "xyz.openbmc_project.Association.Definitions",
-    [The associations interface.])
-
-AC_DEFINE(PNOR_TOC_FILE, "pnor.toc",
-    [The name of the PNOR table of contents file])
-AC_DEFINE(MEDIA_DIR, "/media/",
-    [The base dir where all PNOR RO AND RW partitions are mounted])
-AC_DEFINE(PERSIST_DIR, "/var/lib/obmc/openpower-pnor-code-mgmt/",
-    [The dir where activation data is stored in files])
-AC_DEFINE(PNOR_RO_PREFIX, "/media/pnor-ro-",
-    [The prefix path for the versioned read-only pnor partitions])
-AC_DEFINE(PNOR_RW_PREFIX, "/media/pnor-rw-",
-    [The prefix path for the versioned read-write pnor partitions])
-AC_DEFINE(PNOR_PRSV, "/media/pnor-prsv",
-    [The path for the preserved pnor partitions])
-AC_DEFINE(PNOR_ACTIVE_PATH, "/var/lib/phosphor-software-manager/pnor/",
-    [Path to the active pnor partitions])
-AC_DEFINE(PNOR_RO_ACTIVE_PATH, "/var/lib/phosphor-software-manager/pnor/ro",
-    [Path to the active read-only pnor partitions])
-AC_DEFINE(PNOR_RW_ACTIVE_PATH, "/var/lib/phosphor-software-manager/pnor/rw",
-    [Path to the active read-write pnor partitions])
-AC_DEFINE(PNOR_PRSV_ACTIVE_PATH, "/var/lib/phosphor-software-manager/pnor/prsv",
-    [Path to the active preserved pnor partitions])
-
-# Setup ubifs layout support
-AC_ARG_ENABLE([ubifs_layout],
-    AS_HELP_STRING([--enable-ubifs_layout], [Enable ubifs support.]))
-AS_IF([test "x$enable_ubifs_layout" == "xyes"], \
-    [AC_DEFINE([UBIFS_LAYOUT],[],[Enable ubifs support.])])
-AM_CONDITIONAL([UBIFS_LAYOUT], [test "x$enable_ubifs_layout" == "xyes"])
-
-# Setup MMC layout support
-AC_ARG_ENABLE([mmc_layout],
-    AS_HELP_STRING([--enable-mmc_layout], [Enable MMC support.]))
-AS_IF([test "x$enable_mmc_layout" == "xyes"], \
-    [AC_DEFINE([MMC_LAYOUT],[],[Enable MMC support.])])
-AM_CONDITIONAL([MMC_LAYOUT], [test "x$enable_mmc_layout" == "xyes"])
-
-# Setup static layout support (default)
-AS_IF([test "x$enable_ubifs_layout" != "xyes" -a "x$enable_mmc_layout" != "xyes"], \
-    [AC_DEFINE([STATIC_LAYOUT],[],[Enable static layout support.])])
-AM_CONDITIONAL([STATIC_LAYOUT], [test "x$enable_ubifs_layout" != "xyes" -a "x$enable_mmc_layout" != "xyes"])
-
-AC_ARG_VAR(ACTIVE_PNOR_MAX_ALLOWED, [The maximum allowed active pnor versions])
-AS_IF([test "x$ACTIVE_PNOR_MAX_ALLOWED" == "x"], [ACTIVE_PNOR_MAX_ALLOWED=2])
-AC_DEFINE_UNQUOTED([ACTIVE_PNOR_MAX_ALLOWED], [$ACTIVE_PNOR_MAX_ALLOWED], [The maximum allowed active pnor versions])
-
-AC_ARG_VAR(PNOR_MSL, [The PNOR minimum ship level])
-AS_IF([test "x$PNOR_MSL" == "x"], [PNOR_MSL=""])
-AC_DEFINE_UNQUOTED([PNOR_MSL], ["$PNOR_MSL"], [The PNOR minimum ship level])
-
-AC_ARG_VAR(PNOR_VERSION_PARTITION, [The name of the PNOR version partition])
-AS_IF([test "x$PNOR_VERSION_PARTITION" == "x"], [PNOR_VERSION_PARTITION="VERSION"])
-AC_DEFINE_UNQUOTED([PNOR_VERSION_PARTITION], ["$PNOR_VERSION_PARTITION"],
-    [The name of the PNOR version partition])
-
-AC_CONFIG_FILES([Makefile test/Makefile])
-AC_OUTPUT
diff --git a/m4/.gitkeep b/m4/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/m4/.gitkeep
+++ /dev/null
diff --git a/mmc/Makefile.am.include b/mmc/Makefile.am.include
deleted file mode 100644
index 9c9aab7..0000000
--- a/mmc/Makefile.am.include
+++ /dev/null
@@ -1,12 +0,0 @@
-openpower_update_manager_SOURCES += \
-	%reldir%/activation_mmc.cpp \
-	%reldir%/item_updater_mmc.cpp
-
-dist_bin_SCRIPTS += \
-	%reldir%/obmc-flash-bios
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA += \
-	%reldir%/obmc-flash-bios-init.service \
-	%reldir%/obmc-flash-bios-patch.service
-endif
diff --git a/static/Makefile.am.include b/static/Makefile.am.include
deleted file mode 100644
index 126907f..0000000
--- a/static/Makefile.am.include
+++ /dev/null
@@ -1,3 +0,0 @@
-openpower_update_manager_SOURCES += \
-	%reldir%/item_updater_static.cpp \
-	%reldir%/activation_static.cpp
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100755
index 7a711a6..0000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)
-
-# gtest unit tests which run during a 'make check'
-check_PROGRAMS = utest test_functions
-
-# Run all 'check' test programs
-TESTS = $(check_PROGRAMS)
-
-# Build/add utest to test suite
-utest_CPPFLAGS = \
-	-Igtest \
-	$(GTEST_CPPFLAGS) \
-	$(AM_CPPFLAGS)
-
-utest_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(PHOSPHOR_LOGGING_CFLAGS) \
-	$(PHOSPHOR_DBUS_INTERFACES_CFLAGS)
-
-utest_LDFLAGS = \
-	-lgtest_main \
-	-lgtest \
-	$(PTHREAD_LIBS) \
-	$(OESDK_TESTCASE_FLAGS) \
-	$(PHOSPHOR_LOGGING_LIBS) \
-	$(PHOSPHOR_DBUS_INTERFACES_LIBS) \
-	-lssl \
-	-lcrypto
-
-utest_SOURCES = \
-	../activation.cpp \
-	../version.cpp \
-	../item_updater.cpp \
-	../image_verify.cpp \
-	../utils.cpp \
-	../msl_verify.cpp \
-	../ubi/activation_ubi.cpp \
-	../ubi/item_updater_ubi.cpp \
-	../ubi/serialize.cpp \
-	../ubi/watch.cpp \
-	../static/item_updater_static.cpp \
-	../static/activation_static.cpp \
-	test_signature.cpp \
-	test_version.cpp \
-	test_item_updater_static.cpp \
-	msl_verify.cpp
-
-test_functions_CPPFLAGS = \
-	-Igtest \
-	$(GTEST_CPPFLAGS) \
-	$(AM_CPPFLAGS)
-
-test_functions_CXXFLAGS = \
-	$(PTHREAD_CFLAGS) \
-	$(SDBUSPLUS_CFLAGS) \
-	$(SDEVENTPLUS_CFLAGS)
-
-test_functions_LDFLAGS = \
-	-lgtest_main \
-	-lgtest \
-	$(SDBUSPLUS_LIBS) \
-	$(SDEVENTPLUS_LIBS)
-
-test_functions_SOURCES = \
-	test_functions.cpp \
-	../functions.cpp
diff --git a/test/README.md b/test/README.md
index 6e62971..b69b84f 100755
--- a/test/README.md
+++ b/test/README.md
@@ -3,18 +3,15 @@
 * When using an SDK - make sure it has been built
   for an x86 machine.
 
-- First, generate the configure script with a call
-  to ./bootstrap.sh.
-- Once configure script generated, configure with flags
-  "./configure ${CONFIGURE_FLAGS} --enable-oe-sdk"
-- Be sure to include --enable-oe-sdk or the tests
-  will not run properly.
-- Lastly "make check" will build the application
-  source along with unit tests.  Make check also
-  runs the unit tests automatically.
+- Run the following commands:
+
+  ```
+  meson -Doe-sdk=enabled -Dtests=enabled build
+  ninja -C build test
+  ```
 
 * WHEN RUNNING UTEST remember to take advantage
-  of the gtest capabilities. "./utest --help"
+  of the gtest capabilities. "./build/test/utest --help"
   - --gtest_repeat=[COUNT]
   - --gtest_shuffle
   - --gtest_random_seed=[NUMBER]
diff --git a/ubi/Makefile.am.include b/ubi/Makefile.am.include
deleted file mode 100644
index 3e442f8..0000000
--- a/ubi/Makefile.am.include
+++ /dev/null
@@ -1,19 +0,0 @@
-openpower_update_manager_SOURCES += \
-	%reldir%/activation_ubi.cpp \
-	%reldir%/item_updater_ubi.cpp \
-	%reldir%/serialize.cpp \
-	%reldir%/watch.cpp
-
-dist_bin_SCRIPTS += \
-	%reldir%/obmc-flash-bios
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA += \
-	%reldir%/obmc-flash-bios-cleanup.service \
-	%reldir%/obmc-flash-bios-ubiattach.service \
-	%reldir%/obmc-flash-bios-ubimount@.service \
-	%reldir%/obmc-flash-bios-ubipatch.service \
-	%reldir%/obmc-flash-bios-ubiremount.service \
-	%reldir%/obmc-flash-bios-ubiumount-ro@.service \
-	%reldir%/obmc-flash-bios-ubiumount-rw@.service
-endif
diff --git a/vpnor/Makefile.am.include b/vpnor/Makefile.am.include
deleted file mode 100644
index ce7e535..0000000
--- a/vpnor/Makefile.am.include
+++ /dev/null
@@ -1,9 +0,0 @@
-dist_bin_SCRIPTS += \
-	%reldir%/obmc-vpnor-util
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA += \
-	%reldir%/obmc-vpnor-check-clearvolatile@.service \
-	%reldir%/obmc-vpnor-enable-clearvolatile@.service \
-	%reldir%/obmc-vpnor-updatesymlinks.service
-endif