diff --git a/jode/jode/bytecode/Makefile.am b/jode/jode/bytecode/Makefile.am
index 432bdb9..278e005 100644
--- a/jode/jode/bytecode/Makefile.am
+++ b/jode/jode/bytecode/Makefile.am
@@ -6,6 +6,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
    -dependdir=$(top_builddir) -classpath=$(top_builddir):$(top_srcdir)
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
+SUBSTCP = @SUBSTCP@
 BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
 
 MY_JAVA_FILES = \
@@ -24,7 +25,8 @@ MY_JAVA_FILES = \
   MethodInfo.java \
   Opcodes.java \
   Reference.java \
-  SearchPath.java
+  SearchPath.java \
+  TypeSignature.java
 
 noinst_DATA = $(MY_JAVA_FILES:.java=.class)
 EXTRA_DIST = $(MY_JAVA_FILES)
@@ -32,7 +34,7 @@ EXTRA_DIST = $(MY_JAVA_FILES)
 @QUOTE@-include $(MY_JAVA_FILES:.java=.dep)
 
 %.class: %.java
-	$(JAVAC) -classpath $(BUILD_CLASSPATH):$(CLASSLIB) -d $(top_builddir) $<
+	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
 
 %.dep: %.class
 	$(JAVADEP) $< >$@