diff --git a/win32/Icecast2win.clw b/win32/Icecast2win.clw
index 47b42e0c..80e97fb9 100755
--- a/win32/Icecast2win.clw
+++ b/win32/Icecast2win.clw
@@ -13,16 +13,16 @@ Class2=CIcecast2winDlg
 Class3=CAboutDlg
 
 ResourceCount=8
-Resource1=IDD_STATSDIALOG
+Resource1=IDD_ABOUTBOX
 Resource2=IDR_MAINFRAME
-Resource3=IDR_MENU2
-Resource4=IDD_SSTATUS
+Resource3=IDD_ICECAST2WIN_DIALOG
+Resource4=IDD_STATSDIALOG
 Class4=CStatus
-Resource5=IDD_ABOUTBOX
+Resource5=IDD_CONFIGDIALOG
 Class5=CConfigTab
 Class6=CStatsTab
-Resource6=IDD_ICECAST2WIN_DIALOG
-Resource7=IDD_CONFIGDIALOG
+Resource6=IDD_SSTATUS
+Resource7=IDR_MENU2
 Resource8=IDR_MENU3
 
 [CLS:CIcecast2winApp]
@@ -36,7 +36,7 @@ Type=0
 HeaderFile=Icecast2winDlg.h
 ImplementationFile=Icecast2winDlg.cpp
 Filter=D
-LastObject=ID__PUTTHISSTATINTHETITLE
+LastObject=ID__MAKETHISSTATTHEWINDOWTITLE
 BaseClass=CResizableDialog
 VirtualFilter=dWC
 
@@ -129,5 +129,6 @@ CommandCount=1
 Type=1
 Class=?
 Command1=ID__DELETEFROMGLOBALSTATS
-CommandCount=1
+Command2=ID__MAKETHISSTATTHEWINDOWTITLE
+CommandCount=2
 
diff --git a/win32/Icecast2win.dsp b/win32/Icecast2win.dsp
index f4e5b9f7..11b91c4c 100644
--- a/win32/Icecast2win.dsp
+++ b/win32/Icecast2win.dsp
@@ -43,8 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../../pthreads" /I "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -54,7 +53,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 Releaseicecast\icecast.lib ..\..\ogg\win32\Static_Release\ogg_static.lib ..\..\vorbis\win32\Vorbis_Static_Release\vorbis_static.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/Icecast2.exe"
+# ADD LINK32 Releaseicecast\icecast.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /out:"Release/Icecast2.exe"
+# SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "Icecast2win - Win32 Debug"
 
@@ -70,8 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../../pthreads" /I "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "_AFXDLL" /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "../src" /I "../src/httpp" /I "../src/thread" /I "../src/log" /I "../src/avl" /I "../src/net" /I "src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_WIN32" /D "_AFXDLL" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -81,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 Debugicecast\icecast.lib ..\..\..\ogg\win32\Static_Debug\ogg_static_d.lib ..\..\..\vorbis\win32\Vorbis_Static_Debug\vorbis_static_d.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept
+# ADD LINK32 Debugicecast\icecast.lib ..\..\oggvorbis-win32sdk-1.0\lib\ogg_static_d.lib ..\..\oggvorbis-win32sdk-1.0\lib\vorbis_static_d.lib ..\..\libxml2\lib\libxml2.lib ..\..\libxslt\lib\libxslt.lib ..\..\iconv\lib\iconv.lib ..\..\pthreads\pthreadVSE.lib ws2_32.lib winmm.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"LIBCMTD.lib" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/win32/Icecast2win.dsw b/win32/Icecast2win.dsw
index fc8526e1..cc99fe00 100644
--- a/win32/Icecast2win.dsw
+++ b/win32/Icecast2win.dsw
@@ -17,12 +17,6 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name icecast
     End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ogg_static
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name vorbis_static
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -39,30 +33,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ogg_static"=..\..\ogg\win32\ogg_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "vorbis_static"=..\..\vorbis\win32\vorbis_static.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Global:
 
 Package=<5>
diff --git a/win32/Icecast2win.rc b/win32/Icecast2win.rc
index 3bd5243b..74a1e24e 100644
--- a/win32/Icecast2win.rc
+++ b/win32/Icecast2win.rc
@@ -227,6 +227,9 @@ BEGIN
     POPUP " "
     BEGIN
         MENUITEM "Delete From Global Stats",    ID__DELETEFROMGLOBALSTATS
+        MENUITEM "Make this stat the window title", 
+                                                ID__MAKETHISSTATTHEWINDOWTITLE
+
     END
 END
 
diff --git a/win32/Icecast2winDlg.cpp b/win32/Icecast2winDlg.cpp
index fb150e5e..fafacd3c 100644
--- a/win32/Icecast2winDlg.cpp
+++ b/win32/Icecast2winDlg.cpp
@@ -48,12 +48,14 @@ CString gConfigurationSave;
 typedef struct tagElement {
 	CString	name;
 	CString	value;
+	int		titleFlag;
 } Element;
 
 typedef struct tagElementAdditional {
 	CString source;
 	CString	name;
 	CString	value;
+	int		titleFlag;
 } ElementAdditional;
 
 
@@ -95,6 +97,48 @@ void AddToAdditionalGlobalStats(CString source, CString name) {
 	}
 	g_mainDialog->UpdateStatsLists();
 }
+
+void ClearTitleAdditionalGlobalStats(CString source, CString name) {
+	int foundit = 0;
+	int i,j;
+	for (i=0;i<gAdditionalGlobalStats.numStats;i++) {
+		gAdditionalGlobalStats.stats[i].titleFlag = 0;
+	}
+	for (i=0;i<numMainStats;i++) {
+		for (j=0;j<gStats[i].numStats;j++) {
+			if ((gStats[i].source == source) && (gStats[i].stats[j].name == name)) {
+				gStats[i].stats[j].titleFlag = 0;
+			}
+		}
+	}
+	g_mainDialog->UpdateStatsLists();
+}
+void AddToTitleAdditionalGlobalStats(CString source, CString name) {
+	int foundit = 0;
+	int i,j;
+	for (i=0;i<gAdditionalGlobalStats.numStats;i++) {
+		if ((gAdditionalGlobalStats.stats[i].source == source) && (gAdditionalGlobalStats.stats[i].name == name)) {
+			ClearTitleAdditionalGlobalStats(source, name);
+			gAdditionalGlobalStats.stats[i].titleFlag = 1;
+			foundit = 1;
+			break;
+		}
+	}
+	if (!foundit) {
+		for (i=0;i<numMainStats;i++) {
+			for (j=0;j<gStats[i].numStats;j++) {
+				if ((gStats[i].source == source) && (gStats[i].stats[j].name == name)) {
+					ClearTitleAdditionalGlobalStats(source, name);
+					gStats[i].stats[j].titleFlag = 1;
+					foundit = 1;
+					break;
+				}
+			}
+		}
+	}
+	g_mainDialog->UpdateStatsLists();
+}
+
 void RemoveFromAdditionalGlobalStats(CString source, CString name) {
 	int foundit = 0;
 	for (int i=0;i<gAdditionalGlobalStats.numStats;i++) {
@@ -937,6 +981,20 @@ void CIcecast2winDlg::UpdateStatsLists()
 			}
 		}
 	}
+	for (l=0;l < gAdditionalGlobalStats.numStats;l++) {
+		if (gAdditionalGlobalStats.stats[l].titleFlag) {
+			CString	windowTitle = gAdditionalGlobalStats.stats[l].source + " - " + gAdditionalGlobalStats.stats[l].name + " - " + gAdditionalGlobalStats.stats[l].value;
+			SetWindowText(windowTitle);
+		}
+	}
+	for (l=0;l < numMainStats;l++) {
+		for (int k=0;k < gStats[i].numStats;k++) {
+			if (gStats[i].stats[k].titleFlag) {
+				CString	windowTitle = gStats[i].source + " - " + gStats[i].stats[l].name + " - " + gAdditionalGlobalStats.stats[l].value;
+				SetWindowText(windowTitle);
+			}
+		}
+	}
 }
 
 char	gAppName[255] = "icecast2";
@@ -1052,3 +1110,9 @@ void CIcecast2winDlg::OnSize(UINT nType, int cx, int cy)
 	}
 
 }
+
+void CIcecast2winDlg::OnPutthisstatinthetitle() 
+{
+	// TODO: Add your command handler code here
+	
+}
diff --git a/win32/Icecast2winDlg.h b/win32/Icecast2winDlg.h
index b777c891..a3a2d0bb 100644
--- a/win32/Icecast2winDlg.h
+++ b/win32/Icecast2winDlg.h
@@ -101,6 +101,7 @@ protected:
 	afx_msg void OnStart();
 	afx_msg void OnClose();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnPutthisstatinthetitle();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };
diff --git a/win32/Status.cpp b/win32/Status.cpp
index 919edf8e..7c23b43d 100644
--- a/win32/Status.cpp
+++ b/win32/Status.cpp
@@ -16,6 +16,8 @@ static char THIS_FILE[] = __FILE__;
 #endif
 
 extern void RemoveFromAdditionalGlobalStats(CString source, CString name);
+extern void AddToTitleAdditionalGlobalStats(CString source, CString name);
+
 
 /////////////////////////////////////////////////////////////////////////////
 // CStatus dialog
@@ -128,6 +130,28 @@ void CStatus::OnRclickGlobalstatList(NMHDR* pNMHDR, LRESULT* pResult)
 			}
 	   }
 		break;
+	case ID__MAKETHISSTATTHEWINDOWTITLE :
+		pos = m_GlobalStatList.GetFirstSelectedItemPosition();
+		if (pos != NULL) {
+			nItem = m_GlobalStatList.GetNextSelectedItem(pos);
+			LVITEM	lvi;
+
+			lvi.mask =  LVIF_TEXT;
+			lvi.iItem = nItem;
+			lvi.iSubItem = 0;
+			lvi.pszText = buffer;
+			lvi.cchTextMax = sizeof(buffer);
+			m_GlobalStatList.GetItem(&lvi);
+			source = buffer;
+			lvi.iSubItem = 1;
+			lvi.pszText = buffer2;
+			lvi.cchTextMax = sizeof(buffer2);
+			m_GlobalStatList.GetItem(&lvi);
+			name = buffer2;
+
+			AddToTitleAdditionalGlobalStats(source, name);
+		}
+		break;
 	default :
 		break;
 	}
diff --git a/win32/icecast.dsp b/win32/icecast.dsp
index 9cbc0417..9ac14f67 100644
--- a/win32/icecast.dsp
+++ b/win32/icecast.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Releaseicecast"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,8 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debugicecast"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../ogg/include" /I "../../vorbis/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../libxslt/include" /I "../../iconv/include" /I "../../libxml2/include" /I "..\src" /I "..\src/httpp" /I "..\src/thread" /I "..\src/log" /I "..\src/avl" /I "..\src/net" /I "..\src/timings" /I "../../pthreads" /I "../../oggvorbis-win32sdk-1.0/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/win32/icecast.xml b/win32/icecast.xml
index 2f8c7890..f474325a 100644
--- a/win32/icecast.xml
+++ b/win32/icecast.xml
@@ -1,5 +1,5 @@
 <icecast>

-	<location>Jack's House</location>

+	<location>Nowhere</location>

 	<admin>jack@icecast.org</admin>

 

 	<limits>

@@ -22,7 +22,7 @@
 	</directory>

 

 	<hostname>localhost</hostname>

-	<port>8100</port>

+	<port>8000</port>

 	<!--<bind-address>127.0.0.1</bind-address>-->

 

 	<!--<master-server>127.0.0.1</master-server>-->

@@ -30,21 +30,16 @@
 	<!--<master-update-interval>120</master-update-interval>-->

 

         <paths>

-                <webroot>.\webroot</webroot>

                 <basedir>.</basedir>

                 <logdir>.</logdir>

+                <webroot>.\web</webroot>

         </paths>

 

 	<logging>

 		<accesslog>access.log</accesslog>

 		<errorlog>error.log</errorlog>

+		<!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->

+		<loglevel>4</loglevel>

 	</logging>

-

-    <security>

-        <chroot>0</chroot>

-<!--    <changeowner>

-            <user>nobody</user>

-            <group>nogroup</group>

-        </changeowner>  -->

-    </security>

 </icecast>

+

diff --git a/win32/icecast2.iss b/win32/icecast2.iss
index f8e23b93..2551e08c 100644
--- a/win32/icecast2.iss
+++ b/win32/icecast2.iss
@@ -13,7 +13,7 @@ AllowNoIcons=yes
 LicenseFile=..\COPYING
 InfoAfterFile=..\README
 OutputDir=.
-OutputBaseFilename=Icecast2_win32_beta8_setup.exe
+OutputBaseFilename=Icecast2_win32_09082002_setup.exe
 WizardImageFile=icecast2logo2.bmp
 ; uncomment the following line if you want your installation to run on NT 3.51 too.
 ; MinVersion=4,3.51
@@ -22,14 +22,14 @@ WizardImageFile=icecast2logo2.bmp
 Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4
 
 [Files]
-Source: "D:\Ed\xiph\icecast\win32\Release\Icecast2.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\icecast\win32\status.xsl"; DestDir: "{app}\webroot"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\icecast\win32\status2.xsl"; DestDir: "{app}\webroot"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\pthreads\pthreadVSE.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\icecast\win32\icecast.xml"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\iconv\lib\iconv.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\libxslt\lib\libxslt.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
-Source: "D:\Ed\xiph\libxml2\lib\libxml2.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "Release\Icecast2.exe"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "..\web\status.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
+Source: "..\web\status2.xsl"; DestDir: "{app}\web"; CopyMode: alwaysoverwrite
+Source: "..\..\pthreads\pthreadVSE.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "icecast.xml"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "..\..\iconv\lib\iconv.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "..\..\libxslt\lib\libxslt.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
+Source: "..\..\libxml2\lib\libxml2.dll"; DestDir: "{app}"; CopyMode: alwaysoverwrite
 
 [Icons]
 
diff --git a/win32/resource.h b/win32/resource.h
index dd726906..fef9a2b5 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -55,13 +55,14 @@
 #define ID_FILE                         32775
 #define ID_POPUP_ADDTOGLOBALSTATLIST    32776
 #define ID__DELETEFROMGLOBALSTATS       32777
+#define ID__MAKETHISSTATTHEWINDOWTITLE  32779
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        160
-#define _APS_NEXT_COMMAND_VALUE         32778
+#define _APS_NEXT_COMMAND_VALUE         32780
 #define _APS_NEXT_CONTROL_VALUE         1036
 #define _APS_NEXT_SYMED_VALUE           101
 #endif