diff --git a/mod/help.php b/mod/help.php
index aa0ee8ae6..81ecd6ba9 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -76,14 +76,18 @@ function help_content(&$a) {
 	$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
 
 	if($doctype === 'html')
-		return $text;
+		$content = $text;
 	if($doctype === 'markdown')	
-		return Markdown($text);
+		$content = Markdown($text);
 	if($doctype === 'bbcode') {
 		require_once('include/bbcode.php');
-		return bbcode($text);
+		$content = bbcode($text);
 	} 
 
+	return replace_macros(get_markup_template("help.tpl"), array(
+		'$content' => $content
+	));
+
 }
 
 
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..e01243077
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>