diff --git a/cleanup/meson.build b/cleanup/meson.build
new file mode 100644
index 0000000..fa053a0
--- /dev/null
+++ b/cleanup/meson.build
@@ -0,0 +1,32 @@
+cleanup_pre = declare_dependency(
+  include_directories: [root_inc, include_directories('.')],
+  dependencies : [
+    blobs_dep,
+    phosphor_logging_dep])
+
+cleanup_lib = static_library(
+  'firmwarecleanupblob',
+  'cleanup.cpp',
+  'fs.cpp',
+  conf_h,
+  implicit_include_directories: false,
+  dependencies: cleanup_pre)
+
+cleanup_dep = declare_dependency(
+  link_with: cleanup_lib,
+  dependencies: cleanup_pre)
+
+shared_module(
+  'firmwarecleanupblob',
+  'main.cpp',
+  implicit_include_directories: false,
+  dependencies: [
+    cleanup_dep,
+    dependency('libipmid'),
+  ],
+  install: true,
+  install_dir: get_option('libdir') / 'blob-ipmid')
+
+if not get_option('tests').disabled()
+  subdir('test')
+endif
diff --git a/cleanup/test/meson.build b/cleanup/test/meson.build
new file mode 100644
index 0000000..3a7111d
--- /dev/null
+++ b/cleanup/test/meson.build
@@ -0,0 +1,8 @@
+cleanup_test = executable(
+  'cleanup',
+  'cleanup_handler_unittest.cpp',
+  build_by_default: false,
+  implicit_include_directories: false,
+  include_directories: root_inc,
+  dependencies: [cleanup_dep, gtest, gmock])
+test('cleanup', cleanup_test)