diff --git a/inc/config.php b/inc/config.php
index 5cee7ce1..812d0558 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -633,6 +633,30 @@
  * ====================
  */
 
+	// JIS ASCII art. This *must* be the first markup or it won't work.
+	$config['markup'][] = array(
+		"/\[(aa|code)\](.+?)\[\/(?:aa|code)\]/ms", 
+		function($matches) {
+			$markupchars = array('_', '\'', '~', '*', '=');
+			$replacement = $markupchars;
+			array_walk($replacement, function(&$v) {
+				$v = "&#".ord($v).";";
+			});
+
+			// These are hacky fixes for ###board-tags### and >quotes.
+			$markupchars[] = '###';
+			$replacement[] = '###';
+			$markupchars[] = '>';
+			$replacement[] = '>';
+
+			if ($matches[1] === 'aa') {
+				return '<span class="aa">' . str_replace($markupchars, $replacement, $matches[2]) . '</span>';
+			} else {
+				return str_replace($markupchars, $replacement, $matches[0]);
+			}
+		}
+	);
+
 	// "Wiki" markup syntax ($config['wiki_markup'] in pervious versions):
 	$config['markup'][] = array("/'''(.+?)'''/", "<strong>\$1</strong>");
 	$config['markup'][] = array("/''(.+?)''/", "<em>\$1</em>");
diff --git a/stylesheets/style.css b/stylesheets/style.css
index bd97e099..bd899756 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1016,4 +1016,12 @@ span.pln {
 }
 div.mix {
 	display: inline-block;
+} 
+
+/* Mona Font */
+
+.aa {
+	font-family: Mona, "MS PGothic", "ＭＳ Ｐゴシック", sans-serif;
+	display: block!important;
+	font-size: 12pt;
 }