diff --git a/libmapper/Makefile b/libmapper/Makefile
index 806390c..2f71515 100644
--- a/libmapper/Makefile
+++ b/libmapper/Makefile
@@ -1,16 +1,18 @@
 libdir=/usr/lib
+sbindir=/usr/sbin
 includedir=/usr/include
 
 PACKAGE_DEPS=libsystemd
 SONAME=libmapper.so
 VERSION=1
 LIBMAPPER=$(SONAME).$(VERSION)
+BIN=mapper
 INCLUDES=mapper.h
 
 LDLIBS+=$(shell pkg-config --libs $(PACKAGE_DEPS))
 ALL_CFLAGS+=$(shell pkg-config --cflags $(PACKAGE_DEPS)) -fPIC -Werror $(CFLAGS)
 
-all: $(SONAME)
+all: $(SONAME) $(BIN)
 
 %.o: %.c
 	$(CC) -c $(ALL_CFLAGS) -o $@ $<
@@ -22,12 +24,17 @@
 	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(SONAME) \
 		-o $@ $^ $(LDLIBS)
 
-install: $(SONAME) $(LIBMAPPER)
+$(BIN): app.o $(LIBMAPPER)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+install: $(SONAME) $(LIBMAPPER) $(BIN)
 	@mkdir -p $(DESTDIR)$(includedir)
 	install $(INCLUDES) $(DESTDIR)$(includedir)
 	@mkdir -p $(DESTDIR)$(libdir)
 	install $(LIBMAPPER) $(DESTDIR)$(libdir)
 	ln -sf $(LIBMAPPER) $(DESTDIR)$(libdir)/$(SONAME)
+	@mkdir -p $(DESTDIR)$(sbindir)
+	install $(BIN) $(DESTDIR)$(sbindir)
 
 clean:
-	rm -f *.o $(LIBMAPPER) $(SONAME)
+	rm -f *.o $(LIBMAPPER) $(SONAME) $(BIN)