diff -aurN httpd-2.2.3.orig/modules/metadata/mod_usertrack.mak httpd-2.2.3/modules/metadata/mod_usertrack.mak
--- httpd-2.2.3.orig/modules/metadata/mod_usertrack.mak	2006-07-27 16:05:22.000000000 -0700
+++ httpd-2.2.3/modules/metadata/mod_usertrack.mak	2006-08-19 10:18:26.000000000 -0700
@@ -55,7 +55,7 @@
 	-@erase "$(OUTDIR)\mod_usertrack.lib"
 	-@erase "$(OUTDIR)\mod_usertrack.pdb"
 	-@erase "$(OUTDIR)\mod_usertrack.so"
-	-@erase ".\Debug\mod_usertrack.res"
+	-@erase ".\Release\mod_usertrack.res"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -96,7 +96,7 @@
 MTL=midl.exe
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"Debug/mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" 
+RSC_PROJ=/l 0x409 /fo"Release/mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\mod_usertrack.bsc" 
 BSC32_SBRS= \
@@ -105,7 +105,7 @@
 LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_usertrack.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\mod_usertrack.so" /implib:"$(OUTDIR)\mod_usertrack.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_usertrack.so /opt:ref 
 LINK32_OBJS= \
 	"$(INTDIR)\mod_usertrack.obj" \
-	".\Debug\mod_usertrack.res" \
+	".\Release\mod_usertrack.res" \
 	"..\..\srclib\apr\Release\libapr-1.lib" \
 	"..\..\srclib\apr-util\Release\libaprutil-1.lib" \
 	"..\..\Release\libhttpd.lib"
@@ -302,8 +302,8 @@
 !IF  "$(CFG)" == "mod_usertrack - Win32 Release"
 
 
-".\Debug\mod_usertrack.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"Debug/mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i "\asf-build\build-2.2.3\build\win32" /d "_DEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
+".\Release\mod_usertrack.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"Release/mod_usertrack.res" /i "../../include" /i "../../srclib/apr/include" /i "\asf-build\build-2.2.3\build\win32" /d "_DEBUG" /d BIN_NAME="mod_usertrack.so" /d LONG_NAME="usertrack_module for Apache" $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "mod_usertrack - Win32 Debug"
diff -aurN httpd-2.2.3.orig/support/htpasswd.mak httpd-2.2.3/support/htpasswd.mak
--- httpd-2.2.3.orig/support/htpasswd.mak	2006-07-27 16:05:40.000000000 -0700
+++ httpd-2.2.3/support/htpasswd.mak	2006-08-19 10:20:36.000000000 -0700
@@ -53,7 +53,7 @@
 	-@erase "$(INTDIR)\htpasswd_src.pdb"
 	-@erase "$(OUTDIR)\htpasswd.exe"
 	-@erase "$(OUTDIR)\htpasswd.pdb"
-	-@erase ".\Debug\htpasswd.res"
+	-@erase ".\Release\htpasswd.res"
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -92,7 +92,7 @@
 <<
 
 RSC=rc.exe
-RSC_PROJ=/l 0x409 /fo"Debug/htpasswd.res" /i "../include" /i "../srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="htpasswd.exe" /d LONG_NAME="Apache htpasswd command line utility" 
+RSC_PROJ=/l 0x409 /fo"Release/htpasswd.res" /i "../include" /i "../srclib/apr/include" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="htpasswd.exe" /d LONG_NAME="Apache htpasswd command line utility" 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\htpasswd.bsc" 
 BSC32_SBRS= \
@@ -101,7 +101,7 @@
 LINK32_FLAGS=kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\htpasswd.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\htpasswd.exe" /opt:ref 
 LINK32_OBJS= \
 	"$(INTDIR)\htpasswd.obj" \
-	".\Debug\htpasswd.res" \
+	".\Release\htpasswd.res" \
 	"..\srclib\apr\LibR\apr-1.lib" \
 	"..\srclib\apr-util\LibR\aprutil-1.lib"
 
@@ -271,8 +271,8 @@
 !IF  "$(CFG)" == "htpasswd - Win32 Release"
 
 
-".\Debug\htpasswd.res" : $(SOURCE) "$(INTDIR)"
-	$(RSC) /l 0x409 /fo"Debug/htpasswd.res" /i "../include" /i "../srclib/apr/include" /i "\asf-build\build-2.2.3\build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="htpasswd.exe" /d LONG_NAME="Apache htpasswd command line utility" $(SOURCE)
+".\Release\htpasswd.res" : $(SOURCE) "$(INTDIR)"
+	$(RSC) /l 0x409 /fo"Release/htpasswd.res" /i "../include" /i "../srclib/apr/include" /i "\asf-build\build-2.2.3\build\win32" /d "_DEBUG" /d "APP_FILE" /d BIN_NAME="htpasswd.exe" /d LONG_NAME="Apache htpasswd command line utility" $(SOURCE)
 
 
 !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"