19 files changed, 19 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common
index cbd87ed06a..a1f43128a2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -247,7 +247,7 @@ DIST_FILES_THEMES:=$(addprefix $(srcdir)/gui/themes/,$(DIST_FILES_THEMES))
 # Networking files
 DIST_FILES_NETWORKING=
 ifdef USE_SDL_NET
-DIST_FILES_NETWORKING:=$(addprefix $(srcdir)/backends/networking/,wwwroot.zip)
+DIST_FILES_NETWORKING:=$(addprefix $(srcdir)/dists/networking/,wwwroot.zip)
 endif
 
 # Engine data files
diff --git a/backends/networking/make_archive.py b/devtools/make-www-archive.py
index 64d314bedd..95aeb1533f 100644..100755
--- a/backends/networking/make_archive.py
+++ b/devtools/make-www-archive.py
@@ -4,6 +4,7 @@ import sys
 import re
 import os
 import zipfile
+import argparse
 
 ARCHIVE_FILE_EXTENSIONS = ('.html', '.css', '.js', '.ico', '.png')
 
@@ -31,6 +32,16 @@ def buildArchive(archiveName):
 	zf.close()
 
 def main():
+	parser = argparse.ArgumentParser(description='Generates wwwroot archive')
+	parser.add_argument('path', nargs='?', help='path where the wwwroot source data can be found')
+	args = parser.parse_args()
+	if args.path != None:
+		if not os.path.isdir(args.path):
+			print ("Directory '" + args.path + "' does not exist!")
+			return
+		else:	
+			os.chdir(args.path)
+	
 	buildArchive("wwwroot")
 
 if __name__ == "__main__":
diff --git a/devtools/module.mk b/devtools/module.mk
index 1d682cdf05..0f2d19176a 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -44,6 +44,11 @@ devtools/make-scumm-fontdata$(EXEEXT): $(srcdir)/devtools/make-scumm-fontdata.c
 	$(QUIET)$(MKDIR) devtools/$(DEPDIR)
 	$(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
 
+# Rule to explicitly rebuild the wwwroot archive
+wwwroot:
+	$(srcdir)/devtools/make-www-archive.py $(srcdir)/dists/networking/
+	
+
 #
 # Rules to explicitly rebuild the credits / MD5 tables.
 # The rules for the files in the "web" resp. "docs" modules
diff --git a/backends/networking/wwwroot.zip b/dists/networking/wwwroot.zip
index b767d7c5d7..b767d7c5d7 100644
--- a/backends/networking/wwwroot.zip
+++ b/dists/networking/wwwroot.zip
diff --git a/backends/networking/wwwroot/.files.html b/dists/networking/wwwroot/.files.html
index f05c0113f8..f05c0113f8 100644
--- a/backends/networking/wwwroot/.files.html
+++ b/dists/networking/wwwroot/.files.html
diff --git a/backends/networking/wwwroot/.filesAJAX.html b/dists/networking/wwwroot/.filesAJAX.html
index d45c73069d..d45c73069d 100644
--- a/backends/networking/wwwroot/.filesAJAX.html
+++ b/dists/networking/wwwroot/.filesAJAX.html
diff --git a/backends/networking/wwwroot/.index.html b/dists/networking/wwwroot/.index.html
index 2a3d9d382d..2a3d9d382d 100644
--- a/backends/networking/wwwroot/.index.html
+++ b/dists/networking/wwwroot/.index.html
diff --git a/backends/networking/wwwroot/ajax.js b/dists/networking/wwwroot/ajax.js
index c01d7e93fc..c01d7e93fc 100644
--- a/backends/networking/wwwroot/ajax.js
+++ b/dists/networking/wwwroot/ajax.js
diff --git a/backends/networking/wwwroot/favicon.ico b/dists/networking/wwwroot/favicon.ico
index 0283e8432e..0283e8432e 100644
--- a/backends/networking/wwwroot/favicon.ico
+++ b/dists/networking/wwwroot/favicon.ico
diff --git a/backends/networking/wwwroot/icons/7z.png b/dists/networking/wwwroot/icons/7z.png
index 656e7e7c62..656e7e7c62 100644
--- a/backends/networking/wwwroot/icons/7z.png
+++ b/dists/networking/wwwroot/icons/7z.png
diff --git a/backends/networking/wwwroot/icons/dir.png b/dists/networking/wwwroot/icons/dir.png
index bcdec04a57..bcdec04a57 100644
--- a/backends/networking/wwwroot/icons/dir.png
+++ b/dists/networking/wwwroot/icons/dir.png
diff --git a/backends/networking/wwwroot/icons/txt.png b/dists/networking/wwwroot/icons/txt.png
index 023d2ee24a..023d2ee24a 100644
--- a/backends/networking/wwwroot/icons/txt.png
+++ b/dists/networking/wwwroot/icons/txt.png
diff --git a/backends/networking/wwwroot/icons/unk.png b/dists/networking/wwwroot/icons/unk.png
index 346eebecc3..346eebecc3 100644
--- a/backends/networking/wwwroot/icons/unk.png
+++ b/dists/networking/wwwroot/icons/unk.png
diff --git a/backends/networking/wwwroot/icons/up.png b/dists/networking/wwwroot/icons/up.png
index 2dc3df022b..2dc3df022b 100644
--- a/backends/networking/wwwroot/icons/up.png
+++ b/dists/networking/wwwroot/icons/up.png
diff --git a/backends/networking/wwwroot/icons/zip.png b/dists/networking/wwwroot/icons/zip.png
index cdfc5763dd..cdfc5763dd 100644
--- a/backends/networking/wwwroot/icons/zip.png
+++ b/dists/networking/wwwroot/icons/zip.png
diff --git a/backends/networking/wwwroot/logo.png b/dists/networking/wwwroot/logo.png
index 9fdd2d0d1e..9fdd2d0d1e 100644
--- a/backends/networking/wwwroot/logo.png
+++ b/dists/networking/wwwroot/logo.png
diff --git a/backends/networking/wwwroot/style.css b/dists/networking/wwwroot/style.css
index ba31587c4d..ba31587c4d 100644
--- a/backends/networking/wwwroot/style.css
+++ b/dists/networking/wwwroot/style.css
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index d52d97dd2d..023e7a0965 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -20,7 +20,7 @@ scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 translations.dat       FILE    "gui/themes/translations.dat"
 #endif
 #ifdef USE_SDL_NET
-wwwroot.zip            FILE    "backends/networking/wwwroot.zip"
+wwwroot.zip            FILE    "dists/networking/wwwroot.zip"
 #endif
 
 #if ENABLE_ACCESS   == STATIC_PLUGIN
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 60fa44b017..3d7375b1da 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -20,7 +20,7 @@ scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 translations.dat       FILE    "gui/themes/translations.dat"
 #endif
 #ifdef USE_SDL_NET
-wwwroot.zip            FILE    "backends/networking/wwwroot.zip"
+wwwroot.zip            FILE    "dists/networking/wwwroot.zip"
 #endif
 
 #if ENABLE_ACCESS   == STATIC_PLUGIN