diff --git a/jode/jode/GlobalOptions.java.in b/jode/jode/GlobalOptions.java.in
index 0d79e80..3ccd61f 100644
--- a/jode/jode/GlobalOptions.java.in
+++ b/jode/jode/GlobalOptions.java.in
@@ -1,4 +1,4 @@
-/* GlobalOptions Copyright (C) 1999 Jochen Hoenicke.
+/* GlobalOptions Copyright (C) 1999-2000 Jochen Hoenicke.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ public class GlobalOptions {
     public final static String version = "@VERSION@";
     public final static String email = "jochen@gnu.org";
     public final static String copyright = 
-	"Jode (c) 1998,1999 Jochen Hoenicke <"+email+">";
+	"Jode (c) 1998-2000 Jochen Hoenicke <"+email+">";
     public final static String URL =
 	"http://www.informatik.uni-oldenburg.de/~delwi/jode/jode.html";
 
diff --git a/jode/jode/Makefile.am b/jode/jode/Makefile.am
index 8c64211..0dcb7f8 100644
--- a/jode/jode/Makefile.am
+++ b/jode/jode/Makefile.am
@@ -10,7 +10,7 @@ JAVADEP = $(top_builddir)/javaDependencies.pl -subdir=$(subdir)\
 CLASSPATH = @CLASSPATH@
 CLASSLIB = @CLASSLIB@
 SUBSTCP = @SUBSTCP@
-BUILD_CLASSPATH = $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB)
+FULL_CLASSPATH := $(shell $(SUBSTCP) $(top_srcdir):$(top_builddir):$(CLASSPATH):$(CLASSLIB))
 
 MY_JAVA_FILES = \
   AssertError.java \
@@ -26,7 +26,7 @@ JARFILE = jode-@VERSION@.jar
 @QUOTE@-include Makefile.dep
 
 %.class: %.java
-	$(JAVAC) -classpath `$(SUBSTCP) $(BUILD_CLASSPATH):$(CLASSLIB)` -d $(top_builddir) $<
+	$(JAVAC) -classpath $(FULL_CLASSPATH) -d $(top_builddir) $<
 
 Makefile.dep: $(MY_JAVA_FILES:.java=.class)
 	$(JAVADEP) $^
diff --git a/jode/jode/jode.jodescript b/jode/jode/jode.jodescript
deleted file mode 100644
index ca576ac..0000000
--- a/jode/jode/jode.jodescript
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is a sample script file to obfuscate the JODE project.
-
-# First we select what we want to strip.  There are several possibilities:
-#   unreach - strip unreachable methods and classes.
-#   source  - strip source file attribute.
-#   lnt     - strip line number table.
-#   lvt     - strip local variable table.
-#   inner   - strip inner class info
-strip = "unreach"
-
-load = new WildCard { value = "jode" }
-
-preserve = new WildCard { value = "jode.Decompiler.main.*" },
-           new WildCard { value = "jode.JodeApplet.<init>.()V" },
-           new WildCard { value = "jode.JodeWindow.main.*" },
-           new WildCard { value = "jode.obfuscator.Main.main.*" },
-           new WildCard { value = "jode.swingui.Main.main.*" }
-
-#    value = "jode.Decompiler.main.*", 
-#             "jode.JodeApplet.<init>.()V",
-#             "jode.JodeWindow.main.*",
-#             "jode.obfuscator.Main.main.*",
-#             "jode.swingui.Main.main.*"
-
-analyzer = new SimpleAnalyzer
-post = new LocalOptimizer, new RemovePopAnalyzer