diff --git a/src/Makefile.am b/src/Makefile.am
index 70b37de..9bdb532 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,9 +12,14 @@
 			  rspro/libosmo-asn1-rspro.la
 libosmo_rspro_la_SOURCES = rspro_util.c
 
-noinst_HEADERS = bankd.h client.h internal.h rspro_util.h
+noinst_HEADERS = bankd.h client.h internal.h rspro_util.h \
+		 simtrace2/apdu_dispatch.h \
+		 simtrace2/libusb_util.h \
+		 simtrace2/simtrace2-discovery.h \
+		 simtrace2/simtrace_prot.h \
+		 simtrace2/simtrace_usb.h
 
-bin_PROGRAMS = pcsc_test remsim-bankd remsim-client
+bin_PROGRAMS = pcsc_test remsim-bankd remsim-client simtrace2-remsim-client
 
 pcsc_test_SOURCES = driver_core.c driver_pcsc.c main.c
 pcsc_test_LDADD = $(OSMOCORE_LIBS) \
@@ -27,3 +32,10 @@
 remsim_client_SOURCES = remsim_client.c remsim_client_fsm.c
 remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \
 		     libosmo-rspro.la
+
+simtrace2_remsim_client_SOURCES = simtrace2-remsim_client.c remsim_client_fsm.c \
+				  simtrace2/apdu_dispatch.c \
+				  simtrace2/simtrace2-discovery.c \
+				  simtrace2/libusb_util.c
+simtrace2_remsim_client_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) $(USB_LIBS) $(OSMOSIM_LIBS)\
+		     libosmo-rspro.la