diff --git a/meson.build b/meson.build
index 194c69b..92db933 100644
--- a/meson.build
+++ b/meson.build
@@ -256,12 +256,28 @@
     install: true
 )
 
+software_manager_common_sources = files()
+
+if get_option('software-update-dbus-interface').allowed()
+    executable(
+        'phosphor-software-manager',
+        'software_manager.cpp',
+        software_manager_common_sources,
+        dependencies: [deps, ssl],
+        install: true
+    )
+    unit_files += [
+        'xyz.openbmc_project.Software.Manager.service.in'
+    ]
+endif
+
 executable(
     'phosphor-version-software-manager',
     'image_manager.cpp',
     'image_manager_main.cpp',
     'version.cpp',
     'watch.cpp',
+    software_manager_common_sources,
     dependencies: [deps, ssl],
     install: true
 )
diff --git a/meson.options b/meson.options
index b088a8d..605786d 100644
--- a/meson.options
+++ b/meson.options
@@ -25,6 +25,10 @@
     description: 'Firmware update via USB.',
 )
 
+option('software-update-dbus-interface', type: 'feature', value: 'enabled',
+    description: 'Implementation using software update D-Bus interface - https://github.com/openbmc/docs/blob/master/designs/code-update.md.',
+)
+
 option(
     'side-switch-on-boot', type: 'feature', value: 'enabled',
     description: 'Automatic flash side switch on boot',
diff --git a/software_manager.cpp b/software_manager.cpp
new file mode 100644
index 0000000..5245d71
--- /dev/null
+++ b/software_manager.cpp
@@ -0,0 +1,9 @@
+#include <phosphor-logging/lg2.hpp>
+
+PHOSPHOR_LOG2_USING;
+
+int main()
+{
+    info("Creating Software Manager");
+    return 0;
+}
diff --git a/xyz.openbmc_project.Software.Manager.service.in b/xyz.openbmc_project.Software.Manager.service.in
new file mode 100644
index 0000000..f41d248
--- /dev/null
+++ b/xyz.openbmc_project.Software.Manager.service.in
@@ -0,0 +1,12 @@
+[Unit]
+Description=Phosphor Software Manager
+
+[Service]
+ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images'
+ExecStart=/usr/bin/phosphor-software-manager
+Restart=always
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy=multi-user.target