diff --git a/ChangeLog b/ChangeLog
index c7d74347f..1d3ed714e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-30  Badlop  <badlop@process-one.net>
+
+	* src/*/Makefile.win32: Provide explicit beam filenames because
+	nmake does not accept wildcards (thanks to Attila
+	Vangel)(EJAB-543)
+	
 2008-09-29  Badlop  <badlop@process-one.net>
 
 	* contrib/ejabberd-modules.repo: Include 2.0.x branches
diff --git a/src/ejabberd_zlib/Makefile.win32 b/src/ejabberd_zlib/Makefile.win32
index bd9c9d561..c13383fa8 100644
--- a/src/ejabberd_zlib/Makefile.win32
+++ b/src/ejabberd_zlib/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\ejabberd_zlib.beam
 
 SOURCE = ejabberd_zlib_drv.c
 OBJECT = ejabberd_zlib_drv.o
diff --git a/src/eldap/Makefile.win32 b/src/eldap/Makefile.win32
index b5bdbcf14..9733055f9 100644
--- a/src/eldap/Makefile.win32
+++ b/src/eldap/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\eldap.beam ..\eldap_filter.beam ..\eldap_pool.beam ..\eldap_utils.beam
 
 ALL : $(BEAMS)
 
diff --git a/src/mod_irc/Makefile.win32 b/src/mod_irc/Makefile.win32
index 28fc15e9c..9c22f43f1 100644
--- a/src/mod_irc/Makefile.win32
+++ b/src/mod_irc/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\iconv.beam ..\mod_irc.beam ..\mod_irc_connection.beam
 
 SOURCE = iconv_erl.c
 OBJECT = iconv_erl.o
diff --git a/src/mod_muc/Makefile.win32 b/src/mod_muc/Makefile.win32
index e53f9b7f5..5107b1069 100644
--- a/src/mod_muc/Makefile.win32
+++ b/src/mod_muc/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\mod_muc.beam ..\mod_muc_log.beam ..\mod_muc_room.beam
 
 ALL : $(BEAMS)
 
diff --git a/src/mod_proxy65/Makefile.win32 b/src/mod_proxy65/Makefile.win32
index 718dd0c70..7683097d3 100644
--- a/src/mod_proxy65/Makefile.win32
+++ b/src/mod_proxy65/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\mod_proxy65.beam ..\mod_proxy65_lib.beam ..\mod_proxy65_service.beam ..\mod_proxy65_sm.beam ..\mod_proxy65_stream.beam
 
 ALL : $(BEAMS)
 
@@ -19,7 +18,7 @@ $(OUTDIR)\mod_proxy65_service.beam : mod_proxy65_service.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_service.erl
 
 $(OUTDIR)\mod_proxy65_sm.beam : mod_proxy65_sm.erl
-	erlc -W $(EFLAGS) -o $(OUTDIR) mod_mod_proxy65_sm.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_sm.erl
 
 $(OUTDIR)\mod_proxy65_stream.beam : mod_proxy65_stream.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) mod_proxy65_stream.erl
diff --git a/src/mod_pubsub/Makefile.win32 b/src/mod_pubsub/Makefile.win32
index f68375ccd..f981329c9 100644
--- a/src/mod_pubsub/Makefile.win32
+++ b/src/mod_pubsub/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\gen_pubsub_node.beam ..\gen_pubsub_nodetree.beam ..\mod_pubsub.beam ..\nodetree_default.beam ..\nodetree_virtual.beam ..\node_buddy.beam ..\node_club.beam ..\node_default.beam ..\node_dispatch.beam ..\node_pep.beam ..\node_private.beam ..\node_public.beam
 
 ALL : $(BEAMS)
 
@@ -27,9 +26,23 @@ $(OUTDIR)\nodetree_default.beam : nodetree_default.erl
 $(OUTDIR)\nodetree_virtual.beam : nodetree_virtual.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) nodetree_virtual.erl
 
+$(OUTDIR)\node_buddy.beam : node_buddy.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) node_buddy.erl
+
+$(OUTDIR)\node_club.beam : node_club.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) node_club.erl
+
 $(OUTDIR)\node_default.beam : node_default.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) node_default.erl
 
+$(OUTDIR)\node_dispatch.beam : node_dispatch.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) node_dispatch.erl
+
 $(OUTDIR)\node_pep.beam : node_pep.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) node_pep.erl
 
+$(OUTDIR)\node_private.beam : node_private.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) node_private.erl
+
+$(OUTDIR)\node_public.beam : node_public.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) node_public.erl
diff --git a/src/odbc/Makefile.win32 b/src/odbc/Makefile.win32
index 13b54fb2f..2775468b7 100644
--- a/src/odbc/Makefile.win32
+++ b/src/odbc/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\ejabberd_odbc.beam ..\ejabberd_odbc_sup.beam ..\odbc_queries.beam
 
 ALL : $(BEAMS)
 
diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32
index 23f493ff6..60ccb416c 100644
--- a/src/stringprep/Makefile.win32
+++ b/src/stringprep/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\stringprep.beam ..\stringprep_sup.beam
 
 SOURCE = stringprep_drv.c
 AUXIL  = uni_data.c uni_norm.c
diff --git a/src/tls/Makefile.win32 b/src/tls/Makefile.win32
index 576112e20..93ec8471d 100644
--- a/src/tls/Makefile.win32
+++ b/src/tls/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\tls.beam
 
 SOURCE = tls_drv.c
 OBJECT = tls_drv.o
diff --git a/src/web/Makefile.win32 b/src/web/Makefile.win32
index 3fc9ce2a1..411d57ce8 100644
--- a/src/web/Makefile.win32
+++ b/src/web/Makefile.win32
@@ -4,8 +4,7 @@ include ..\Makefile.inc
 EFLAGS = -I .. -pz ..
 
 OUTDIR = ..
-SOURCES = $(wildcard *.erl)
-BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+BEAMS = ..\ejabberd_http.beam ..\ejabberd_http_bind.beam ..\ejabberd_http_poll.beam ..\ejabberd_web.beam ..\ejabberd_web_admin.beam ..\mod_http_bind.beam ..\mod_http_fileserver.beam
 
 ALL : $(BEAMS)
 
@@ -21,5 +20,14 @@ $(OUTDIR)\ejabberd_web.beam : ejabberd_web.erl
 $(OUTDIR)\ejabberd_web_admin.beam : ejabberd_web_admin.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_web_admin.erl
 
+$(OUTDIR)\ejabberd_http_bind.beam : ejabberd_http_bind.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_bind.erl
+
 $(OUTDIR)\ejabberd_http_poll.beam : ejabberd_http_poll.erl
 	erlc -W $(EFLAGS) -o $(OUTDIR) ejabberd_http_poll.erl
+
+$(OUTDIR)\mod_http_bind.beam : mod_http_bind.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_bind.erl
+
+$(OUTDIR)\mod_http_fileserver.beam : mod_http_fileserver.erl
+	erlc -W $(EFLAGS) -o $(OUTDIR) mod_http_fileserver.erl