diff --git a/FIRESTORM-WHERE_TO_PUSH.txt b/FIRESTORM-WHERE_TO_PUSH.txt
new file mode 100644
index 0000000000..51243b9f2e
--- /dev/null
+++ b/FIRESTORM-WHERE_TO_PUSH.txt
@@ -0,0 +1,9 @@
+phoenix-firestorm-gpl	= GPL Contributions
+phoenix-firestorm-lgpl  = LGPL Contributions ONLY!
+phoenix-firestorm-int   = Do not use - for build integration testing 
+			  and upstream merges.
+
+
+If you are working on the -gpl branch, you may merge FROM -lgpl
+
+No changes from -gpl should ever be merged to -lgpl. Code can flow in one direction only.
diff --git a/README_BUILD_FIRESTORM_LINUX b/README_BUILD_FIRESTORM_LINUX.txt
similarity index 100%
rename from README_BUILD_FIRESTORM_LINUX
rename to README_BUILD_FIRESTORM_LINUX.txt
diff --git a/README_BUILD_FIRESTORM_MACOSX b/README_BUILD_FIRESTORM_MACOSX.txt
similarity index 100%
rename from README_BUILD_FIRESTORM_MACOSX
rename to README_BUILD_FIRESTORM_MACOSX.txt
diff --git a/README_BUILD_FIRESTORM_WIN32 b/README_BUILD_FIRESTORM_WIN32
deleted file mode 100644
index 9a62864899..0000000000
--- a/README_BUILD_FIRESTORM_WIN32
+++ /dev/null
@@ -1,6 +0,0 @@
-Follow the snowstorm instructions for setting up a windows build environment
-http://wiki.secondlife.com/wiki/Viewer_2_Microsoft_Windows_Builds
-
-
-[ not implemented yet ] run build_firestorm_win32.sh in cygwin
-
diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt
new file mode 100644
index 0000000000..d485498a2c
--- /dev/null
+++ b/README_BUILD_FIRESTORM_WIN32.txt
@@ -0,0 +1,12 @@
+Follow the snowstorm instructions for setting up a windows build environment
+http://wiki.secondlife.com/wiki/Viewer_2_Microsoft_Windows_Builds
+
+Make sure to copy fmod.dll into both your indra/ folder and also libraries/i686-win32/Release and libraries/RelWithDebInfo
+
+Open up cygwin and navigate to your code directory. Example:
+cd /cygdrive/c/my/path/to/phoenix-firestorm
+
+run ./build_firestorm_win32.sh
+
+This will do a clean compile. Rebuilds should be possible by specifying --rebuild. This build is a work in progress. Alternately, build in visual studio. By default, packaging is not enabled.
+
diff --git a/build_firestorm_win32.sh b/build_firestorm_win32.sh
index 3be7e22a5b..c66541af8f 100644
--- a/build_firestorm_win32.sh
+++ b/build_firestorm_win32.sh
@@ -6,6 +6,7 @@
 
 TRUE=0 # Map the shell's idea of truth to a variable for better documentation
 FALSE=1
+PYTHON="/cygdrive/c/Python26/python.exe"
 LOG="`pwd`/logs/build_win32.log"
 
 ###
@@ -32,6 +33,10 @@ fi
 ### 
 
 path=$WINPATH:/usr/local/bin:/usr/bin:/bin
+if [ ! -f "$PYTHON" ] ; then
+	echo "ERROR: You need to edit this file and set PYTHON at the top to point at the path of your python executable."
+	exit 1
+fi
 
 pushd indra
 if [ $WANTS_CLEAN -eq $TRUE ] ; then
@@ -42,12 +47,16 @@ fi
 
 if [ $WANTS_CONFIG -eq $TRUE ] ; then
 	mkdir -p ../logs > /dev/null 2>&1
-	cmd /c "develop.py -G vc80 configure -DLL_TESTS:BOOL=OFF" | tee $LOG
+	$PYTHON develop.py -G vc80 -t Release configure -DPACKAGE:BOOL=OFF -DLL_TESTS:BOOL=OFF  2>&1 | tee $LOG
+	mkdir -p build_vc80/sharedlibs/RelWithDebInfo
+	mkdir -p build_vc80/sharedlibs/Release
+	cp fmod.dll ./build_vc80/sharedlibs/RelWithDebInfo
+	cp fmod.dll ./build_vc80/sharedlibs/Release
 fi
 
 if [ $WANTS_BUILD -eq $TRUE ] ; then
 	echo "Building in progress... Check $LOG for verbose status"
-	cmd /c "develop.py build" | tee -a $LOG
+	$PYTHON develop.py -G vc80 -t Release build  2>&1 | tee -a $LOG
 	echo "Complete"
 fi
 popd