diff --git a/Makefile.am b/Makefile.am
index c3ae146..96c790b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libfreefare test
+SUBDIRS = libfreefare test examples
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libfreefare.pc
diff --git a/test/Makefile.am b/test/Makefile.am
index c609ad2..9ffddb3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,10 @@
 # $Id$
 
+INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/libfreefare
+LIBS = $(CUTTER_LIBS)
+
+if WITH_CUTTER
+
 TESTS = run-test.sh
 TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
 
@@ -9,9 +14,6 @@ noinst_LTLIBRARIES = \
 		     test_mifare_classic_create_trailer_block.la \
 		     test_mifare_classic_application.la
 
-INCLUDES = $(CUTTER_CFLAGS) -I$(top_srcdir)/libfreefare
-LIBS = $(CUTTER_LIBS)
-
 AM_LDFLAGS = -module -rpath $(libdir) -avoid-version -no-undefined
 
 test_mad_la_SOURCES = test_mad.c
@@ -29,3 +31,5 @@ test_mifare_classic_application_la_LIBADD = $(top_srcdir)/libfreefare/libfreefar
 
 echo-cutter:
 	@echo $(CUTTER)
+
+endif