diff --git a/templates/default/publish.js b/templates/default/publish.js
index 2adf9e2d..19d819ad 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -12,8 +12,10 @@
         @param {Tutorial} tutorials
      */
     publish = function(data, opts, tutorials) {
+        var defaultTemplatePath = 'templates/default';
+        var templatePath = (opts.template) ? opts.template : defaultTemplate;
         var out = '',
-            view = new template.Template(__dirname + '/templates/default/tmpl');
+            view = new template.Template(__dirname + '/' + templatePath + '/tmpl');
         
         // set up templating
         view.layout = 'layout.tmpl';
@@ -174,7 +176,7 @@
         fs.mkPath(outdir);
 
         // copy static files to outdir
-        var fromDir = __dirname + '/templates/default/static',
+        var fromDir = __dirname + '/' + templatePath + '/static',
             staticFiles = fs.ls(fromDir, 3);
             
         staticFiles.forEach(function(fileName) {
@@ -358,7 +360,10 @@
         }
 
         if (globals.length) generate('Global', [{kind: 'globalobj'}], 'global.html');
-        generate('Index', [], 'index.html');
+
+        generate('Index',
+			[{kind: 'mainpage', longname: (opts.mainpagetitle) ? opts.mainpagetitle : "Main Page"}]
+		, 'index.html');
         
         
         function generate(title, docs, filename) {
diff --git a/templates/default/tmpl/container.tmpl b/templates/default/tmpl/container.tmpl
index 9ff6cf3e..1ce41859 100644
--- a/templates/default/tmpl/container.tmpl
+++ b/templates/default/tmpl/container.tmpl
@@ -3,6 +3,12 @@
     docs.forEach(function(doc, i) {
 ?>
 
+<?js if (doc.kind === 'mainpage') { ?>
+	
+	<?js= self.partial('mainpage.tmpl', doc) ?>
+
+<?js } else { ?>
+
 <section>
     
 <header>
@@ -134,4 +140,6 @@
 </article>
 
 </section>  
+<?js } ?>
+
 <?js }); ?>
diff --git a/templates/default/tmpl/mainpage.tmpl b/templates/default/tmpl/mainpage.tmpl
new file mode 100644
index 00000000..ca2abf32
--- /dev/null
+++ b/templates/default/tmpl/mainpage.tmpl
@@ -0,0 +1,6 @@
+<?js
+var self = this;
+?>
+<div class="mainpage">
+  <h1>Welcome page</h1>
+</div>
\ No newline at end of file