diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/Borders.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/Borders.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/Borders.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/CreateCells.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/CreateCells.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateCells.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/CreateDateCells.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/NewSheet.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/NewSheet.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/NewSheet.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java b/src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
similarity index 100%
rename from src/java/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
rename to src/examples/src/org/apache/poi/hssf/usermodel/examples/NewWorkbook.java
diff --git a/tools/targets/compile.xtarget b/tools/targets/compile.xtarget
index 34afaa3cf..040110d8a 100644
--- a/tools/targets/compile.xtarget
+++ b/tools/targets/compile.xtarget
@@ -21,6 +21,12 @@
       <fileset dir="${scratchpad.src}"/>
     </copy>
     
+    <mkdir dir="${build.examples.src}"/>
+    <mkdir dir="${build.examples.dest}"/>
+    <copy todir="${build.examples.src}" filtering="on">
+      <fileset dir="${examples.src}"/>
+    </copy>
+
     <mkdir dir="${build.contrib.src}"/>
     <mkdir dir="${build.contrib.dest}"/>
     <copy todir="${build.contrib.src}" filtering="on">
@@ -80,6 +86,27 @@
       <classpath refid="scratchpad.classpath"/>
     </javac>
     
+    <copy todir="${build.examples.dest}">
+      <fileset dir="${build.examples.src}">
+        <include name="**"/>
+      <!--
+        <include name="**/Manifest.mf"/>
+        <include name="**/*.xsl"/>
+        <include name="**/*.roles"/>
+        <include name="**/*.xconf"/>
+        <include name="META-INF/**"/>
+        -->
+      </fileset>
+    </copy>
+
+    <javac srcdir="${build.examples.src}"
+           destdir="${build.examples.dest}"
+           debug="${debug}"
+           optimize="${optimize}"
+           deprecation="${deprecation}"
+           target="${target.vm}">
+      <classpath refid="examples.classpath"/>
+    </javac>
 
     <copy todir="${build.contrib.dest}">
       <fileset dir="${build.contrib.src}">
@@ -123,6 +150,12 @@
       </fileset>
     </jar>
     
+    <jar jarfile="${build.dir}/${examples.name}.jar">
+      <fileset dir="${build.examples.dest}">
+        <include name="**"/>
+      </fileset>
+    </jar>
+
     <jar jarfile="${build.dir}/${contrib.name}.jar">
       <fileset dir="${build.contrib.dest}">
         <include name="**"/>
diff --git a/tools/targets/init.xtarget b/tools/targets/init.xtarget
index f791f0658..54a74d278 100644
--- a/tools/targets/init.xtarget
+++ b/tools/targets/init.xtarget
@@ -40,6 +40,11 @@
     <property name="scratchpad.lib"  value="${scratchpad.dir}/lib"/>
     <property name="scratchpad.name" value="${name}-scratchpad"/>
 
+    <property name="examples.dir"  value="${src.dir}/examples"/>
+    <property name="examples.src"  value="${examples.dir}/src"/>
+    <property name="examples.lib"  value="${examples.dir}/lib"/>
+    <property name="examples.name" value="${name}-examples"/>
+
     <property name="contrib.dir"  value="${src.dir}/contrib"/>
     <property name="contrib.src"  value="${contrib.dir}/src"/>
     <property name="contrib.lib"  value="${contrib.dir}/lib"/>
@@ -58,6 +63,9 @@
     <property name="build.scratchpad" value="${build.dir}/scratchpad"/>
     <property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
     <property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
+    <property name="build.examples" value="${build.dir}/examples"/>
+    <property name="build.examples.src" value="${build.examples}/src"/>
+    <property name="build.examples.dest" value="${build.examples}/classes"/>
     <property name="build.contrib" value="${build.dir}/contrib"/>
     <property name="build.contrib.src" value="${build.contrib}/src"/>
     <property name="build.contrib.dest" value="${build.contrib}/classes"/>    
diff --git a/tools/targets/preinit.xtarget b/tools/targets/preinit.xtarget
index 27a9ed9fc..4bdfe33f9 100644
--- a/tools/targets/preinit.xtarget
+++ b/tools/targets/preinit.xtarget
@@ -50,6 +50,11 @@
     <pathelement path="./build/${name}/classes"/>
   </path>
 
+  <path id="examples.classpath">
+    <!-- FIXME : how to build a path that references a property set in 'init' target ? -->
+    <pathelement path="./build/${name}/classes"/>
+  </path>
+
   <path id="contrib.classpath">
     <fileset dir="./lib/core">
       <include name="*.jar"/>