diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 4433c05754..849fbd55d7 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -21,7 +21,10 @@
             </classpath>
         </depend>
     </target>
+
     <property name="javac.compilerargs" value="" />
+
+    <!-- compile everything including client classes -->
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
@@ -34,6 +37,7 @@
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
+
     <target name="compileTest" depends="compile">
         <javac 
             srcdir="./test" 
@@ -59,10 +63,26 @@
         </exec>
     </target>
 
+    <!-- does not include client classes, moved to samclient.jar -->
     <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
         <!-- set if unset -->
         <property name="workspace.changes.tr" value="" />
-        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class">
+        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class" excludes="net/i2p/sam/client/*">
+            <manifest>
+                <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
+                <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
+                <attribute name="Implementation-Version" value="${full.version}" />
+                <attribute name="Build-Date" value="${build.timestamp}" />
+                <attribute name="Base-Revision" value="${workspace.version}" />
+                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="clientjar" depends="compile, listChangedFiles" >
+        <!-- set if unset -->
+        <property name="workspace.changes.tr" value="" />
+        <jar destfile="./build/samclient.jar" basedir="./build/obj" includes="net/i2p/sam/client/*.class">
             <manifest>
                 <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
                 <attribute name="Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />
diff --git a/apps/sam/java/src/net/i2p/sam/client/package.html b/apps/sam/java/src/net/i2p/sam/client/package.html
new file mode 100644
index 0000000000..e07cf020e2
--- /dev/null
+++ b/apps/sam/java/src/net/i2p/sam/client/package.html
@@ -0,0 +1,15 @@
+<html><head></head><body>
+<p>
+Demo and test client classes.
+But if you are writing a Java app, you should probably be using
+native I2CP, not SAM.
+</p><p>
+SAMClientEventListenerImpl, SAMEventHandler, and SAMReader
+are a SAM client API in Java, useful for event based streaming (or
+for testing the SAM bridge).
+</p><p>
+SAMStreamSink and SAMStreamSend
+are a pair of SAM demo apps
+mirroring the streaming lib's
+StreamSink and StreamSend demo apps for transferring files.
+</p></body></html>
diff --git a/build.xml b/build.xml
index 91abfea569..863363e4fb 100644
--- a/build.xml
+++ b/build.xml
@@ -402,7 +402,7 @@
             <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
             <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
             <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
-            <group title="SAM Bridge" packages="net.i2p.sam:net.i2p.sam.client" />
+            <group title="SAM Bridge" packages="net.i2p.sam" />
             <group title="SusiDNS Application" packages="i2p.susi.dns" />
             <group title="SusiMail Application" packages="i2p.susi.webmail:i2p.susi.webmail.*:i2p.susi.debug:i2p.susi.util" />
             <group title="Systray Application" packages="net.i2p.apps.systray" />
