diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index aff4b614f5..377127ba75 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => '6c70dd0e',
+    'core.pkg.css' => '5ad20a3f',
     'core.pkg.js' => 'c907bd96',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => '5a65a762',
@@ -113,7 +113,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => 'fb286311',
     'rsrc/css/application/uiexample/example.css' => '4741b891',
     'rsrc/css/core/core.css' => 'da26ddb2',
-    'rsrc/css/core/remarkup.css' => '32cace73',
+    'rsrc/css/core/remarkup.css' => 'bec51bf1',
     'rsrc/css/core/syntax.css' => '3c18c1cb',
     'rsrc/css/core/z-index.css' => '1bbbd4f1',
     'rsrc/css/diviner/diviner-shared.css' => 'be90f718',
@@ -700,7 +700,7 @@ return array(
     'phabricator-prefab' => '9eaf0bfa',
     'phabricator-profile-css' => '3a7e04ca',
     'phabricator-project-tag-css' => '095c9404',
-    'phabricator-remarkup-css' => '32cace73',
+    'phabricator-remarkup-css' => 'bec51bf1',
     'phabricator-search-results-css' => 'f240504c',
     'phabricator-settings-css' => 'ea8f5915',
     'phabricator-shaped-request' => 'dfa181a4',
diff --git a/src/docs/user/userguide/remarkup.diviner b/src/docs/user/userguide/remarkup.diviner
index 9f1e54e448..b15dcc0e35 100644
--- a/src/docs/user/userguide/remarkup.diviner
+++ b/src/docs/user/userguide/remarkup.diviner
@@ -241,9 +241,21 @@ You can use ##lines=N## to limit the vertical size of a chunk of code, and
   <p>Mangostine</p>
   <p>Melon</p>
 
-You can also use "NOTE:" to call out an important idea.
+You can also use "NOTE:", "WARNING:", or "IMPORTANT:" to call out an important
+ idea.
 
-NOTE: Don't cross the streams!
+NOTE: Best practices in proton pack operation include not crossing the streams.
+
+WARNING: Crossing the streams can result in total protonic reversal!
+
+IMPORTANT: Don't cross the streams!
+
+You can also use "(NOTE)", "(WARNING)", or "(IMPORTANT)" to get the same
+ effect but without "(NOTE"), "(WARNING)", or "(IMPORTANT)" appearing in the
+ rendered result. For example
+
+(NOTE) Dr. Egon Spengler is the best resource for additional proton pack
+ questions.
 
 = Linking URIs =
 
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 8da19295bf..5e4f1add68 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -178,6 +178,20 @@
   background: #f3f3ff;
 }
 
+.phabricator-remarkup .remarkup-warning {
+  margin: 1em 1.5em;
+  padding: 0.5em 1em;
+  border: 1px solid {$yellow};
+  background: {$lightyellow};
+}
+
+.phabricator-remarkup .remarkup-important {
+  margin: 1em 1.5em;
+  padding: 0.5em 1em;
+  border: 1px solid {$red};
+  background: {$lightred};
+}
+
 .phabricator-remarkup-toc {
   float: right;
   border: 1px solid #d7d7d7;
@@ -402,6 +416,8 @@ div.phabricator-remarkup-dark tt {
 }
 
 div.phabricator-remarkup-dark .remarkup-note,
+div.phabricator-remarkup-dark .remarkup-warning,
+div.phabricator-remarkup-dark .remarkup-important,
 div.phabricator-remarkup-dark table {
   color: #000;
 }