diff --git a/reactos/subsys/system/explorer/Makefile b/reactos/subsys/system/explorer/Makefile
index 910b51de54f..172c1119dda 100644
--- a/reactos/subsys/system/explorer/Makefile
+++ b/reactos/subsys/system/explorer/Makefile
@@ -129,7 +129,7 @@ ever:
 buildno.h: ../../../include/reactos/buildno.h
 	$(CD_PREFIX)updatebuildno
 
-$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll libexpat.dll
+$(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX) notifyhook.dll ..\..\..\lib\expat\libexpat.dll
 	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))
 
 explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
@@ -157,7 +157,6 @@ implib:
 install:
 	-$(TOOLS_PATH)/rcopy $(TARGET) $(INSTALL_DIR)/$(TARGET)
 	-$(TOOLS_PATH)/rcopy notifyhook.dll $(INSTALL_DIR)/system32/notifyhook.dll
-	-$(TOOLS_PATH)/rcopy libexpat.dll $(INSTALL_DIR)/system32/libexpat.dll
 
 bootcd:
 
diff --git a/reactos/subsys/system/explorer/libexpat.dll b/reactos/subsys/system/explorer/libexpat.dll
deleted file mode 100644
index 4f400f07103..00000000000
Binary files a/reactos/subsys/system/explorer/libexpat.dll and /dev/null differ
diff --git a/reactos/subsys/system/explorer/notifyhook/notifyhook.dsp b/reactos/subsys/system/explorer/notifyhook/notifyhook.dsp
index 2c1b2bf9938..0eaac0450de 100644
--- a/reactos/subsys/system/explorer/notifyhook/notifyhook.dsp
+++ b/reactos/subsys/system/explorer/notifyhook/notifyhook.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=notifyhook - Win32 Debug
+CFG=notifyhook - Win32
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,13 @@ CFG=notifyhook - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "notifyhook.mak" CFG="notifyhook - Win32 Debug"
+!MESSAGE NMAKE /f "notifyhook.mak" CFG="notifyhook - Win32"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "notifyhook - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "notifyhook - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "notifyhook - Win32" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -60,8 +61,8 @@ LINK32=link.exe
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "shellhook___Win32_Debug"
-# PROP BASE Intermediate_Dir "shellhook___Win32_Debug"
+# PROP BASE Output_Dir "Win32"
+# PROP BASE Intermediate_Dir "Win32"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -83,12 +84,42 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
 
+!ELSEIF  "$(CFG)" == "notifyhook - Win32"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "notifyhook___Win32_Win32"
+# PROP BASE Intermediate_Dir "notifyhook___Win32_Win32"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "notifyhook___Win32_Win32"
+# PROP Intermediate_Dir "notifyhook___Win32_Win32"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_NOTIFYHOOK_IMPL" /FR /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_NOTIFYHOOK_IMPL" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x407 /d "_DEBUG"
+# ADD RSC /l 0x407 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+
 !ENDIF 
 
 # Begin Target
 
 # Name "notifyhook - Win32 Release"
 # Name "notifyhook - Win32 Debug"
+# Name "notifyhook - Win32"
 # Begin Source File
 
 SOURCE=.\notifyhook.c