diff --git a/src/docs/userguide/remarkup.diviner b/src/docs/userguide/remarkup.diviner
index 03f511bdfb..e6d657e737 100644
--- a/src/docs/userguide/remarkup.diviner
+++ b/src/docs/userguide/remarkup.diviner
@@ -123,4 +123,12 @@ If you set configuration flags, you can embed media directly in text:
 
 These options are disabled by default because they have security and/or
 silliness implications, read their descriptions in ##default.conf.php## before
-enabling them.
\ No newline at end of file
+enabling them.
+
+= Image Macros =
+
+You can upload image macros (Files -> Image Macros) which will replace text
+strings with the image you specify. For instance, you could upload an image of a
+dancing banana to create a macro named "peanutbutterjellytime", and then any
+time you type that string it will be replaced with the image of a dancing
+banana.
\ No newline at end of file