--- MultiBoilerplate.hooks.php_ORIG	2016-10-23 21:51:07.984196841 +0200
+++ MultiBoilerplate.hooks.php	2016-10-23 22:06:33.971681022 +0200
@@ -36,7 +36,7 @@ class MultiBoilerplateHooks {
 	 * @return true
 	 */
 	public static function onEditPageShowEditFormInitial( EditPage $editPage, OutputPage $out ) {
-		global $wgParser, $wgMultiBoilerplateOptions, $wgMultiBoilerplateOverwrite;
+		global $wgParser, $wgMultiBoilerplateOptions, $wgMultiBoilerplateOverwrite, $wgMultiBoilerplatePerNamespace;
 		$title = $out->getTitle();
 		$request = $out->getRequest();
 
@@ -60,7 +60,13 @@ class MultiBoilerplateHooks {
 				$options .= Xml::option( $name, $template, $selected );
 			}
 		} else {
-			$things = wfMessage( 'Multiboilerplate' )->inContentLanguage()->text();
+			$boilerplatepage = 'Multiboilerplate';
+			if ($wgMultiBoilerplatePerNamespace) {
+				$namespace = $title->getNamespace();
+				if ($namespace <> 0) $boilerplatepage .= '-' . $namespace;
+			}
+			$things = wfMessage( $boilerplatepage )->inContentLanguage()->text();
+
 			$options = '';
 			$headingFound = 0;
 			$things = explode( "\n", str_replace(