diff --git a/tutorial/Makefile b/tutorial/Makefile
index 2c9c6033084f2e795b8cb93261bc9cbc15b9b449..5792b968d916ac2b9ebed519e7d31c3ff4ed1904 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -2,13 +2,36 @@ all: tutorial.html tutorial_onepage.html
 
 # lenna.gif lenna-mirrorx.gif lenna-mirrory.gif lenna-rotate.gif lenna-skewx.gif lenna-skewy.gif
 
-SRCFILES=tutorial.wmml Image.wmml Mysql.wmml
+MADEFILES=Image.wmml Mysql.wmml ProtocolsHTTP.wmml Parser.wmml Calendar.wmml
+SRCFILES=tutorial.wmml $(MADEFILES)
 
 pike=pike
 DESTINATION=/usr/local/share/pike/tutorial/
 
 .DUMMY: 
 
+# ----------------------------------------------------------------------
+
+Image.wmml : 
+	(cd ../src/modules/Image; make wmml pike="$(pike)")
+
+Mysql.wmml : 
+	$(pike) ../bin/mkwmml.pike ../src/modules/Mysql/mysql.c >Mysql.wmml
+
+Parser.wmml : 
+	$(pike) ../bin/mkwmml.pike ../src/modules/Parser/*.c >Parser.wmml
+
+ProtocolsHTTP.wmml :
+	$(pike) ../bin/mkwmml.pike ../lib/modules/Protocols.pmod/HTTP.pmod/*.p*[^~] >ProtocolsHTTP.wmml
+
+Calendar.wmml :
+	$(pike) ../bin/mkwmml.pike ../lib/modules/Calendar.pmod/*.p*[^~] >Calendar.wmml
+
+
+# ----------------------------------------------------------------------
+
+srcfiles: $(SRCFILES) 
+
 tutorial.html: .DUMMY $(SRCFILES)
 	$(pike) ./wmmltohtml2 tutorial.wmml html tutorial
 
@@ -21,23 +44,17 @@ tut.html: .DUMMY $(SRCFILES)
 manpages: .DUMMY $(SRCFILES)
 	$(pike) ./wmmltohtml2 tutorial.wmml manpages man/man
 
-Image.wmml : 
-	(cd ../src/modules/Image; make wmml pike="$(pike)")
-
-Mysql.wmml :
-	$(pike) ../bin/mkwmml.pike ../src/modules/Mysql/mysql.c >Mysql.wmml
-
-the_image_module_onepage.html: Image.wmml the_image_module.wmml
+the_image_module_onepage.html: .DUMMY Image.wmml the_image_module.wmml
 	$(pike) ./wmmltohtml2 the_image_module.wmml html_onepage the_image_module_onepage
 
 the_image_module.html: Image.wmml the_image_module.wmml
 	$(pike) ./wmmltohtml2 the_image_module.wmml html the_image_module
 
 clean:
-	rm *.html *.md illustration_cache illustration*.gif Image.wmml
+	-rm *.html *.md illustration_cache illustration*.gif $(MADEFILES)
 
 rebuild:
-	-rm Image.wmml Mysql.wmml
+	-rm $(MADEFILES)
 	make pike="$(pike)" Image.wmml Mysql.wmml tutorial.html
 
 install:
@@ -47,8 +64,5 @@ export:
 	tar czvTf tutorial.files tutorial.tar.gz 
 	tar czvTf tutorial_onepage.files tutorial_onepage.tar.gz 
 
-remakeImage.wmml:
-	rm Image.wmml || exit 0
-
-mirar_www: remakeImage.wmml the_image_module_onepage.html
+mirar_www: Image.wmml the_image_module_onepage.html
 	ln -f illustration*.gif the_image_module_onepage.html /home/mirar/www/image
diff --git a/tutorial/tutorial.wmml b/tutorial/tutorial.wmml
index d59c4bd92e9524929e1330f99fd6e6cb60a9ac02..f1f4918e05e14e3bb551b93af310221d2bc4cc14 100644
--- a/tutorial/tutorial.wmml
+++ b/tutorial/tutorial.wmml
@@ -3385,7 +3385,7 @@ here is a list of the basic Pike modules:
 <dt>Process
 <dd>Functions to start and control other processes.
 <dt>Protocols
-<dd>Support for NNTP, SMNT, DNS, TELNET and other protocols.
+<dd>Support for HTTP, NNTP, SMNT, DNS, TELNET and other protocols.
 <dt>Regexp
 <dd>Regexp matching routines.
 <dt>Simulate
@@ -6136,6 +6136,19 @@ which says what time it is in white text on a black background.
 </chapter>
 </anchor>
 
+<anchor name=Protocols>
+<chapter title=Protocols>
+
+The Protocol modules is some helper modules that makes it easier for
+the pike programmer to use some of the protocols used on the internet.
+
+<hr newpage>
+
+<include file=protocols.wmml>
+
+</chapter>
+</anchor>
+
 <chapter title="Other modules">
 
 Pike also include a number of smaller modules. These modules implement support
@@ -9925,6 +9938,14 @@ prints.
 <include file=Mysql.wmml>
 <include file=crypto.wmml>
 
+<section title=Calendar>
+<include file=Calendar.wmml>
+</section>
+
+<section title=Parser>
+<include file=Parser.wmml>
+</section title=Parser>
+
 </chapter>
 
 <chapter title="The preprocessor">