diff -Naur camljava-0.3.orig/lib/Makefile camljava-0.3/lib/Makefile
--- camljava-0.3.orig/lib/Makefile	2009-11-24 14:43:18.555035491 +0100
+++ camljava-0.3/lib/Makefile	2009-11-24 14:42:07.943485242 +0100
@@ -46,7 +46,7 @@
 	rm -f fr/inria/caml/camljava/*.class
 
 clean::
-	rm -f *.cm? *.[oa]
+	rm -f *.cm? *.[oa] *.cmxa
 
 .SUFFIXES: .ml .mli .cmo .cmi .cmx
 
diff -Naur camljava-0.3.orig/Makefile.config camljava-0.3/Makefile.config
--- camljava-0.3.orig/Makefile.config	2004-07-08 16:02:53.000000000 +0200
+++ camljava-0.3/Makefile.config	2009-11-24 14:52:27.474829525 +0100
@@ -17,7 +17,7 @@
 ## For other platforms, adjust as required and tell us about it.
 
 # Home location for the JDK.  Only used for setting other variables below. 
-JDKHOME=/usr/local/java_1.4.2
+JDKHOME=/usr/lib/jvm/java-6-sun
 
 # Where to find the JNI include files (for compiling the OCaml-JNI C stubs)
 JNIINCLUDES=-I$(JDKHOME)/include -I$(JDKHOME)/include/linux
@@ -25,11 +25,18 @@
 # The library to link with to get the JNI
 JNILIBS=-ljava
 
+# Current architecture identification string, as intended by the JDK.
+# Common values for x86 architectures are "i386" or "amd64". You can find it
+# out by looking for the "*" patch component in the following pattern:
+# $(JDKHOME)/jre/lib/*/libjava.so
+ARCH=amd64
+
 # Additional link-time options to pass to $(CC) when linking with $(JNILIBS)
-JNILIBOPTS=-L$(JDKHOME)/jre/lib/i386/ \
-        -Wl,-rpath,$(JDKHOME)/jre/lib/i386/ \
-        -Wl,-rpath,$(JDKHOME)/jre/lib/i386/client \
-        -Wl,-rpath,$(JDKHOME)/jre/lib/i386/native_threads
+JNILIBOPTS=-L$(JDKHOME)/jre/lib/$(ARCH)/ \
+        -L$(JDKHOME)/jre/lib/$(ARCH)/server \
+        -Wl,-rpath,$(JDKHOME)/jre/lib/$(ARCH)/ \
+        -Wl,-rpath,$(JDKHOME)/jre/lib/$(ARCH)/server \
+        -Wl,-rpath,$(JDKHOME)/jre/lib/$(ARCH)/native_threads
 
 # Additional options when compiling the OCaml-JNI C stubs.
 # -DJDK122_LINUX_HACK works around a nasty thread-related bug of
diff -Naur camljava-0.3.orig/test/jnitest.ml camljava-0.3/test/jnitest.ml
--- camljava-0.3.orig/test/jnitest.ml	2001-06-05 16:01:23.000000000 +0200
+++ camljava-0.3/test/jnitest.ml	2009-11-24 14:37:41.602405336 +0100
@@ -68,4 +68,6 @@
   print_newline()
 
 let _ =
-  test()
+  try
+    test()
+  with exn -> prerr_endline (Printexc.to_string exn)
diff -Naur camljava-0.3.orig/test/Makefile camljava-0.3/test/Makefile
--- camljava-0.3.orig/test/Makefile	2001-06-05 16:01:15.000000000 +0200
+++ camljava-0.3/test/Makefile	2009-11-24 14:44:01.335369289 +0100
@@ -18,3 +18,4 @@
 
 clean::
 	rm -f *.cm?
+	rm -f *.class