diff --git a/bin/Makefile b/bin/Makefile
index be6c1c7..8dd4ef7 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -4,27 +4,38 @@ CC		= $(CROSS)cc
 
 INCLUDE_PATH	= ../include
 
+PKGCONFIG_DEPS	= cairo x11 librsvg-2.0
 CFLAGS		+= -I$(INCLUDE_PATH)
+CFLAGS_APP	= $(CFLAGS) $(shell pkg-config --cflags $(PKGCONFIG_DEPS))
 LDFLAGS		= -L../src -lhexagram
+LDFLAGS_APP	= -L../src -lhexagram $(shell pkg-config --libs $(PKGCONFIG_DEPS)) -lm
 STATIC		= ../src/libhexagram.a
-OBJS		= capture.o can2dump.o replay.o pcapreplay.o pcap2can.o main.o \
-		  dash2can.o
-NAME		= hexagram
+
+OBJS		= capture.o can2dump.o replay.o pcapreplay.o pcap2can.o \
+		  dash2can.o hexagram.o
+OBJS_APP	= hexagram-app.o
+BINS		= hexagram hexagram-app
 
 INSTALL		= install
 RM		= rm
 
-all: $(NAME)
+all: $(BINS)
 
-install: $(NAME)
+install: $BINSNAME)
 	$(INSTALL) -d 0755 $(PREFIX)/bin
-	$(INSTALL) -c -m 0755 $(NAME) $(PREFIX)/bin
+	$(INSTALL) -c -m 0755 $(BINS) $(PREFIX)/bin
 
-$(OBJS): %.o: %.c
+$(OBJS_HEXAGRAM): %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-$(NAME): $(OBJS) $(STATIC)
-	$(CC) $(CFLAGS) -o $(NAME) $(OBJS) $(STATIC)
+$(OBJS_APP): %.o: %.c
+	$(CC) $(CFLAGS_APP) -c $<
+
+hexagram: $(OBJS)
+	$(CC) $(OBJS) -o $@ $(LDFLAGS)
+
+hexagram-app: $(OBJS_APP)
+	$(CC) $(OBJS_APP) -o $@ $(LDFLAGS_APP)
 
 clean:
-	$(RM) -f $(NAME) $(OBJS)
+	$(RM) -f $(BINS) $(OBJS) $(OBJS_APP)
diff --git a/bin/hexagram-app b/bin/hexagram-app
deleted file mode 100755
index 3bb2a73..0000000
--- a/bin/hexagram-app
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env python3
-
-from hexagram.app import main
-
-exit(main())
diff --git a/examples/cluster.c b/bin/hexagram-app.c
similarity index 100%
rename from examples/cluster.c
rename to bin/hexagram-app.c
diff --git a/bin/main.c b/bin/hexagram.c
similarity index 100%
rename from bin/main.c
rename to bin/hexagram.c