diff --git a/apps/sam/jython/build/Makefile b/apps/sam/jython/build/Makefile
index e521a2160..75e897ba9 100644
--- a/apps/sam/jython/build/Makefile
+++ b/apps/sam/jython/build/Makefile
@@ -3,6 +3,9 @@
 # by default, it gets linked into a standalone .jar file, together
 # with the I2P core classes, and the jython classes
 
+# set this to wherever your jython.jar lives
+JYTHONJAR=/usr/share/jython/jython.jar
+
 # sources
 JYTHON_SOURCES=../src/i2psam.py
 
@@ -10,7 +13,7 @@ JYTHON_SOURCES=../src/i2psam.py
 JYTHON_COMPILE=jython
 
 # change this to wherever you put your i2p jars
-CLASSPATH=../../../../build/i2p.jar:../../../../build/mstreaming.jar:../../../jython/lib/jython.jar
+CLASSPATH=../../../../build/i2p.jar:../../../../build/mstreaming.jar:$(JYTHONJAR)
 
 # comment this out to prevent the kitchen sink (i2p code, jython code etc)
 # from being linked into jar. Uncomment it to create a standalone .jar
@@ -29,3 +32,4 @@ i2psam.jar: $(JYTHON_SOURCES) Makefile
 		$(JARLINKOPTIONS) \
 		$(EXTRAPACKAGES) \
 		$(JYTHON_SOURCES)
+
diff --git a/apps/sam/jython/build/README b/apps/sam/jython/build/README
new file mode 100644
index 000000000..121a8d649
--- /dev/null
+++ b/apps/sam/jython/build/README
@@ -0,0 +1,27 @@
+-----------------------------------
+Instructions for building i2psam.jar
+------------------------------------
+
+1) Requirements
+
+You will need:
+
+ - a decent java sdk, eg Sun J2SDK 1.4.2 or later
+ - jython - www.jython.org
+
+Note that you don't need python to build the SAM server
+
+2) Preparation
+
+Edit the Makefile, and set JYTHONJAR to where your jython.jar lives
+Or, if on windows, edit build.bat and set the first field of CLASSPATH
+to where jython.jar lives
+
+3) Building
+
+To build i2psam.jar, simply type 'make'.
+or if on Windows, type 'build.bat'
+
+4) Installing
+
+Copy i2psam.jar to wherever the jar files live on your i2p installation
diff --git a/apps/sam/jython/build/build.bat b/apps/sam/jython/build/build.bat
new file mode 100644
index 000000000..dd6b15439
--- /dev/null
+++ b/apps/sam/jython/build/build.bat
@@ -0,0 +1,11 @@
+@echo off
+rem This makefile constructs the SAM Server i2psam.jar
+
+rem by default, it gets linked into a standalone .jar file, together
+rem with the I2P core classes, and the jython classes
+
+CLASSPATH=\path\to\my\jython.jar;..\..\..\..\build\i2p.jar;..\..\..\..\build\mstreaming.jar
+
+@echo Building i2psam.jar
+jythonc --jar i2psam.jar --all ..\src\i2psam.py
+