diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d49e5683f9621f90a6eed9447f4cc143289634d0..8ab5caac4d16d928314f7f2108fee00d381dd24e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Zen 6.x-2.x-dev
#328221 by kmonty and JohnAlbin: Split up ie.css to remove CSS hacks
Zen 6.x-1.x-dev
+ #362104: layout breaks on Zen-themed maintenance page
* Changed "or" back to "||" in template files since themers do need to learn a little PHP
#346867 by debonator: navbar-inner is missing the "clear-block" class
#325610 by Garrett Albright: Site name and logo don't link to frontpage on multilingual site
diff --git a/zen/maintenance-page.tpl.php b/zen/maintenance-page.tpl.php
new file mode 100644
index 0000000000000000000000000000000000000000..8621d25a8079b013a3c266f94c42b64469f4a4f7
--- /dev/null
+++ b/zen/maintenance-page.tpl.php
@@ -0,0 +1,142 @@
+
+
+
+
+
+ <?php print $head_title; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+