diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
new file mode 100644
index 0000000000..5eae22cf07
--- /dev/null
+++ b/apps/sam/java/build.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="all" name="sam">
+    <target name="all" depends="clean, build" />
+    <target name="build" depends="builddep, jar" />
+    <target name="builddep">
+        <ant dir="../../ministreaming/java/" target="build" />
+	<!-- ministreaming will build core -->
+    </target>
+    <target name="compile">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/obj" />
+        <javac 
+            srcdir="./src" 
+            debug="true" 
+            destdir="./build/obj" 
+            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
+    </target>
+    <target name="jar" depends="compile">
+        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class">
+            <manifest>
+                <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" />
+                <attribute name="Class-Path" value="i2p.jar mstreaming.jar" />
+            </manifest>
+        </jar>
+    </target>
+    <target name="javadoc">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/javadoc" />
+        <javadoc 
+            sourcepath="./src:../../../core/java/src:../../ministreaming/java/src" destdir="./build/javadoc" 
+            packagenames="*" 
+            use="true" 
+            splitindex="true" 
+            windowtitle="SAMBridge" />
+    </target>
+    <target name="clean">
+        <delete dir="./build" />
+    </target>
+    <target name="cleandep" depends="clean">
+	<!-- ministreaming will clean core -->
+        <ant dir="../../ministreaming/java/" target="distclean" />
+    </target>
+    <target name="distclean" depends="clean">
+	<!-- ministreaming will clean core -->
+        <ant dir="../../ministreaming/java/" target="distclean" />
+    </target>
+</project>
diff --git a/build.xml b/build.xml
index c2e954eef2..e7e384c00a 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
         <ant dir="apps/i2ptunnel/java/" target="jar" />
         <ant dir="apps/httptunnel/java/" target="jar" />
         <ant dir="apps/phttprelay/java/" target="jar" />
+        <ant dir="apps/sam/java/" target="jar" />
         <ant dir="apps/heartbeat/java/" target="jar" />
         <ant dir="installer/java/" target="jar" />
     </target>
@@ -29,6 +30,7 @@
         <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
         <copy file="apps/httptunnel/java/build/httptunnel.jar" todir="build/" />
         <copy file="apps/phttprelay/java/build/phttprelay.war" todir="build/" />
+        <copy file="apps/sam/java/build/sam.jar" todir="build/" />
         <copy file="apps/heartbeat/java/build/heartbeat.jar" todir="build/" />
         <copy file="installer/java/build/install.jar" todir="build/" />
         <copy file="installer/java/build/guiinstall.jar" todir="build/" />
@@ -55,6 +57,7 @@
         <ant dir="apps/i2ptunnel/java/" target="distclean" />
         <ant dir="apps/httptunnel/java/" target="distclean" />
         <ant dir="apps/phttprelay/java/" target="distclean" />
+        <ant dir="apps/sam/java/" target="distclean" />
         <ant dir="apps/heartbeat/java/" target="distclean" />
         <ant dir="installer/java/" target="distclean" />
     </target>
diff --git a/installer/java/build.xml b/installer/java/build.xml
index 4e7328104f..8145273fbf 100644
--- a/installer/java/build.xml
+++ b/installer/java/build.xml
@@ -7,6 +7,7 @@
         <ant dir="../../router/java/" target="build" />
         <ant dir="../../apps/ministreaming/java/" target="build" />
         <ant dir="../../apps/i2ptunnel/java/" target="build" />
+        <ant dir="../../apps/sam/java/" target="build" />
     </target>
     <target name="compile">
         <mkdir dir="./build" />
@@ -33,6 +34,7 @@
             <fileset file="../../router/java/build/router.jar" />
             <fileset file="../../apps/ministreaming/java/build/mstreaming.jar" />
             <fileset file="../../apps/i2ptunnel/java/build/i2ptunnel.jar" />
+            <fileset file="../../apps/sam/java/build/sam.jar" />
             <fileset file="../doc/COPYING" />
             <fileset file="../../readme.txt" />
             <fileset file="../../hosts.txt" />
@@ -51,6 +53,7 @@
             <fileset file="../../router/java/build/router.jar" />
             <fileset file="../../apps/ministreaming/java/build/mstreaming.jar" />
             <fileset file="../../apps/i2ptunnel/java/build/i2ptunnel.jar" />
+            <fileset file="../../apps/sam/java/build/sam.jar" />
             <fileset file="../doc/COPYING" />
             <fileset file="../../readme.txt" />
             <fileset file="../../hosts.txt" />
@@ -67,11 +70,13 @@
         <ant dir="../../router/java/" target="cleandep" />
         <ant dir="../../apps/ministreaming/java/" target="cleandep" />
         <ant dir="../../apps/i2ptunnel/java/" target="cleandep" />
+        <ant dir="../../apps/sam/java/" target="cleandep" />
     </target>
     <target name="distclean" depends="clean">
         <ant dir="../../core/java/" target="distclean" />
         <ant dir="../../router/java/" target="distclean" />
         <ant dir="../../apps/ministreaming/java/" target="distclean" />
         <ant dir="../../apps/i2ptunnel/java/" target="distclean" />
+        <ant dir="../../apps/sam/java/" target="distclean" />
     </target>
 </project>
diff --git a/installer/java/src/install.config b/installer/java/src/install.config
index d35fc0cfb9..841346dc8e 100644
--- a/installer/java/src/install.config
+++ b/installer/java/src/install.config
@@ -88,7 +88,7 @@ qs.0045.question=<none>
 qs.0050.question=End of configuration.
 
 
-libs.count=8
+libs.count=9
 libs.0001.name=i2p.jar
     libs.0001.islib=true
 libs.0002.name=i2ptunnel.jar
@@ -105,4 +105,5 @@ libs.0007.name=hosts.txt
     libs.0007.islib=false
 libs.0008.name=mstreaming.jar
     libs.0008.islib=true
-
+libs.0009.name=sam.jar
+    libs.0009.islib=true