diff --git a/Makefile.am b/Makefile.am
index b1746be..a7d0801 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,15 @@
 
 BUILT_SOURCES = binaryblob.pb.h binaryblob.pb.cc
 
+bin_PROGRAMS =
+
+if BUILD_BLOBTOOL
+bin_PROGRAMS += blobtool
+blobtool_SOURCES = blobtool.cpp
+blobtool_LDADD = libbinarystore.la
+blobtool_LDFLAGS = -lprotobuf
+endif
+
 SUBDIRS = . test
 
 ACLOCAL_AMFLAGS = -I m4