diff --git a/Makefile.am.in b/Makefile.am.in
index 1051e5159038e574a23c21735d8dc184b5a8b9f5..91f4077d9ff8d866578cb94d6e7b9d26ad0c77c3 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -6,13 +6,10 @@ BODY:
 AUTOMAKE_OPTIONS = foreign
 
 noinst_LIBRARIES = libsymmetric.a
-noinst_PROGRAMS = desTest desdata bf_test
-
-# FIXME: Use the BASH variable to execute the script. The problem is
-# that the script attempts to start itselt with "$0 args".
+noinst_PROGRAMS = desTest desdata bf_test twofish_test generate_q
 
 Makefile.am: Makefile.am.in
-	(cd $(top_srcdir); ./make_am)
+	(cd $(top_srcdir) && $(MAKE) src/symmetric/Makefile.am)
 
 # When compiling with lsh, this is set to to -DLSH -I/path/to/lsh/include
 # INCLUDES = @crypto_cpp_flags@