diff --git a/java_libs/com/lowagie/bc/asn1/Makefile b/java_libs/com/lowagie/bc/asn1/Makefile
index 0bbceb2..86d9af8 100644
--- a/java_libs/com/lowagie/bc/asn1/Makefile
+++ b/java_libs/com/lowagie/bc/asn1/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/Makefile b/java_libs/com/lowagie/text/Makefile
index af42b5f..259e980 100644
--- a/java_libs/com/lowagie/text/Makefile
+++ b/java_libs/com/lowagie/text/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../.. -d ../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/markup/Makefile b/java_libs/com/lowagie/text/markup/Makefile
index 083d6e8..a8b70d4 100644
--- a/java_libs/com/lowagie/text/markup/Makefile
+++ b/java_libs/com/lowagie/text/markup/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/pdf/Makefile b/java_libs/com/lowagie/text/pdf/Makefile
index f065b5b..83f042d 100644
--- a/java_libs/com/lowagie/text/pdf/Makefile
+++ b/java_libs/com/lowagie/text/pdf/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/pdf/PdfDate.java b/java_libs/com/lowagie/text/pdf/PdfDate.java
index 8a74b80..5ba92cf 100644
--- a/java_libs/com/lowagie/text/pdf/PdfDate.java
+++ b/java_libs/com/lowagie/text/pdf/PdfDate.java
@@ -76,7 +76,7 @@ public class PdfDate extends PdfString {
     // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would
     // omit this class because of its reference by reflection;
     // this treatment ensures that ld will include it
-    private static Class c1= gnu.java.locale.Calendar.class;
+    private static Class c1= java.util.Calendar.class;
 
     private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,
         Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};
diff --git a/java_libs/com/lowagie/text/pdf/codec/Makefile b/java_libs/com/lowagie/text/pdf/codec/Makefile
index 52ceee9..13cbc4b 100644
--- a/java_libs/com/lowagie/text/pdf/codec/Makefile
+++ b/java_libs/com/lowagie/text/pdf/codec/Makefile
@@ -11,13 +11,15 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
-
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
+
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
 
@@ -25,13 +27,14 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../../.. -d ../../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
+
+$(headers): $(classes)
 
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
diff --git a/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile b/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
index 09f7a7b..0d52786 100644
--- a/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
+++ b/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
@@ -11,13 +11,15 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
-
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
+ 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
 
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../../../.. -d ../../../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile b/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
index 58a7a7d..5dfc7ea 100644
--- a/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
+++ b/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
@@ -11,13 +11,15 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
-
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
+
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
 
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../../../.. -d ../../../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/pdf/fonts/Makefile b/java_libs/com/lowagie/text/pdf/fonts/Makefile
index 82e2535..62d03d9 100644
--- a/java_libs/com/lowagie/text/pdf/fonts/Makefile
+++ b/java_libs/com/lowagie/text/pdf/fonts/Makefile
@@ -11,6 +11,7 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 # font metric files, included as resources
 afms= $(wildcard *.afm)
@@ -21,6 +22,7 @@ afm_objects= $(patsubst %.afm, %.o, $(afms))
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -34,8 +36,7 @@ afm_objects= $(patsubst %.afm, %.o, $(afms))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) --classpath="../../../../.." -d ../../../../.. $(package).$*;
 
 ##
 # targets
@@ -45,6 +46,8 @@ afm_objects= $(patsubst %.afm, %.o, $(afms))
 
 all : $(library) $(headers) $(afm_objects)
 
+$(headers) : $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/com/lowagie/text/xml/xmp/Makefile b/java_libs/com/lowagie/text/xml/xmp/Makefile
index 9ec46aa..9f5aa8e 100644
--- a/java_libs/com/lowagie/text/xml/xmp/Makefile
+++ b/java_libs/com/lowagie/text/xml/xmp/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../../.. -d ../../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/gnu/gcj/convert/Makefile b/java_libs/gnu/gcj/convert/Makefile
index ad5e12d..76f88f0 100644
--- a/java_libs/gnu/gcj/convert/Makefile
+++ b/java_libs/gnu/gcj/convert/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/gnu_local/java/security/Makefile b/java_libs/gnu_local/java/security/Makefile
index a11bcf9..8f7bb77 100644
--- a/java_libs/gnu_local/java/security/Makefile
+++ b/java_libs/gnu_local/java/security/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../.. -d ../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/gnu_local/java/security/provider/Makefile b/java_libs/gnu_local/java/security/provider/Makefile
index 748190e..35583cf 100644
--- a/java_libs/gnu_local/java/security/provider/Makefile
+++ b/java_libs/gnu_local/java/security/provider/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../../../.. -d ../../../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/java_libs/java_local/security/Makefile b/java_libs/java_local/security/Makefile
index a11bcf9..70e6c3b 100644
--- a/java_libs/java_local/security/Makefile
+++ b/java_libs/java_local/security/Makefile
@@ -11,12 +11,14 @@ sources= $(wildcard *.java)
 objects= $(patsubst %.java, %.o, $(sources))
 headers= $(patsubst %.java, %.h, $(sources))
 classes= $(patsubst %.java, %.class, $(sources))
+package:=$(shell grep ^package *.java | awk -F : '{ print $$2 }' | awk -F \; '{ print $$1 } ' | awk '{ print $$2 }' | sort -u)
 
 ##
 # implicit rules for creating A from B
 
 %.o : %.java
 	$(GCJ) $(GCJFLAGS) -c $< -o $@
+	${OBJCOPY} -L '_ZGr8_$$_dummy' $@
 
 %.class : %.java
 	$(GCJ) $(GCJFLAGS) -C $<
@@ -25,14 +27,15 @@ classes= $(patsubst %.java, %.class, $(sources))
 # the "$*" automatic variable, here
 #
 %.h : %.class
-	$(GCJH) --classpath="." $*;
-	$(RM) $<
+	$(GCJH) -classpath ../.. -d ../.. $(package).$*;
 
 ##
 # targets
 
 all : $(library) $(headers)
 
+$(headers): $(classes)
+
 $(library) : $(objects)
 	$(AR) $(ARFLAGS) $(library) $(objects);
 
diff --git a/pdftk/Makefile.Generic b/pdftk/Makefile.Generic
index 8ef7ab0..702c6e7 100644
--- a/pdftk/Makefile.Generic
+++ b/pdftk/Makefile.Generic
@@ -28,7 +28,7 @@ CXXFLAGS= -lgcj
 
 # itext compiler flags
 # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
-export GCJFLAGS= -O2
+export GCJFLAGS= -O2 -w
 
 #
 export ARFLAGS= rs