diff --git a/Makefile.am b/Makefile.am
index d373416..50f4683 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-sbin_PROGRAMS = mapper
+sbin_PROGRAMS = mapper mapperx
 
 mapper_SOURCES = libmapper/app.c
 mapper_LDFLAGS = $(SYSTEMD_LIBS)
@@ -11,6 +11,10 @@
 libmapper_la_LDFLAGS = $(SYSTEMD_LIBS) -version-info 1:0:0 -shared
 libmapper_la_CFLAGS = $(SYSTEMD_CFLAGS)
 
+mapperx_SOURCES = src/main.cpp
+mapperx_LDFLAGS = $(SDBUSPLUS_LIBS) -pthread -ltinyxml2
+mapperx_CXXFLAGS = $(SYSTEMD_CFLAGS) -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_ALL_NO_LIB
+
 include_HEADERS = libmapper/mapper.h
 
 if HAVE_PYTHON