diff --git a/java/.gitignore b/java/.gitignore
index c2c5929..f16b802 100644
--- a/java/.gitignore
+++ b/java/.gitignore
@@ -1,3 +1,4 @@
 libjava.jar
+examples/*.class
 org_zoy_caca_*.h
 org/zoy/caca/*.class
diff --git a/java/Makefile.am b/java/Makefile.am
index 9a9003f..8229b40 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -4,6 +4,7 @@ jnidir = $(libdir)/jni
 
 if USE_JAVA
 jni_LTLIBRARIES = libcaca-java.la
+noinst_DATA = examples/Driver.class examples/TrueColor.class
 endif
 
 java_src = $(wildcard $(srcdir)/org/zoy/caca/*.java)
@@ -74,11 +75,13 @@ org_zoy_caca_Font.h: org/zoy/caca/Font.class
 	$(JAVAH) $(JAVAH_FLAGS) org.zoy.caca.Font
 	@touch org_zoy_caca_Font.h
 
-CLEANFILES = org/zoy/caca/*.class org_zoy_caca_[A-Z]*.h $(java_jar)
+CLEANFILES = $(noinst_DATA) $(java_jar) \
+             org/zoy/caca/*.class org_zoy_caca_[A-Z]*.h
 EXTRA_DIST = README
 
 if USE_JAVA
 BUILT_SOURCES = $(java_jni_headers) $(java_jni_classes)
+endif
 
 libcaca_java_la_CPPFLAGS = $(JAVA_CFLAGS)
 libcaca_java_la_SOURCES = \
@@ -91,4 +94,10 @@ libcaca_java_la_LDFLAGS = -shared $(JAVA_LIBS)
 libcaca_java_la_LIBADD = ../caca/libcaca.la
 libcaca_java_ladir = $(datadir)/java
 libcaca_java_la_DATA = $(java_jar)
-endif
+
+examples/Driver.class: examples/Driver.java
+	$(JAVAC) $^
+
+examples/TrueColor.class: examples/TrueColor.java
+	$(JAVAC) $^
+
diff --git a/java/examples/Driver b/java/examples/Driver
new file mode 100755
index 0000000..681eca3
--- /dev/null
+++ b/java/examples/Driver
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR="`dirname $0`"
+java -Djava.library.path="${DIR}/../.libs" \
+     -cp "${DIR}/../libjava.jar:${DIR}" Driver
+
diff --git a/java/examples/Driver.java b/java/examples/Driver.java
index 594fb6d..279ecf6 100644
--- a/java/examples/Driver.java
+++ b/java/examples/Driver.java
@@ -26,7 +26,7 @@ public class Driver {
     Display.Driver driver;
     int i, cur = 0;
     while(true) {
-      cv.put(1, 0, "Availabl driver");
+      cv.put(1, 0, "Available drivers");
       driver = dp.getDriver();
       Display.Driver[] list = Display.getDriverList();
       for (i = 0; i < list.length; i++) {
diff --git a/java/examples/TrueColor b/java/examples/TrueColor
new file mode 100755
index 0000000..9f24775
--- /dev/null
+++ b/java/examples/TrueColor
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR="`dirname $0`"
+java -Djava.library.path="${DIR}/../.libs" \
+     -cp "${DIR}/../libjava.jar:${DIR}" TrueColor
+
diff --git a/java/org/zoy/caca/Caca.java b/java/org/zoy/caca/Caca.java
index b4b6990..b9f9a9d 100644
--- a/java/org/zoy/caca/Caca.java
+++ b/java/org/zoy/caca/Caca.java
@@ -23,7 +23,7 @@ public class Caca {
 
   synchronized public static void load() {
     if (!alreadyLoaded) {
-      System.loadLibrary("java");
+      System.loadLibrary("caca-java");
       alreadyLoaded = true;
     }
   }