diff --git a/NEWS b/NEWS
index 9a180fc2..5131f617 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ NEWS ( CHANGELOG and HISTORY )                                     HTMLPurifier
 ! New directive %HTML.BlockWrapper, for block-ifying inline elements
 ! New directive %HTML.Parent, allows you to only allow inline content
 - Added missing type to ChildDef_Chameleon
+- Remove Tidy option from demo if there is not Tidy available
 . ChildDef_Required guards against empty tags
 . Lookup table HTMLDefinition->info_flow_elements added
 . Added peace-of-mind variable initialization to Strategy_FixNesting
diff --git a/docs/examples/demo.php b/docs/examples/demo.php
index 4fdd259e..3386679e 100644
--- a/docs/examples/demo.php
+++ b/docs/examples/demo.php
@@ -115,8 +115,10 @@ if (isset($html)) {
                 approximately 2000 characters.  If you need to test anything
                 larger than that, try the <a href="demo.php?post">POST form</a>.</p>
         <?php } ?>
-        <div>Nicely format output with Tidy? <input type="checkbox" value="1"
-        name="tidy"<?php if (!empty($_REQUEST['tidy'])) echo ' checked="checked"'; ?> /></div>
+        <?php if (extension_loaded('tidy')) { ?>
+            <div>Nicely format output with Tidy? <input type="checkbox" value="1"
+            name="tidy"<?php if (!empty($_REQUEST['tidy'])) echo ' checked="checked"'; ?> /></div>
+        <?php } ?>
         <div>XHTML 1.0 Strict output? <input type="checkbox" value="1"
         name="strict"<?php if (!empty($_REQUEST['strict'])) echo ' checked="checked"'; ?> /></div>
         <div>Serve as application/xhtml+xml? (not for IE) <input type="checkbox" value="1"