diff --git a/core/wiki/ConfigInfo.tid b/core/wiki/ConfigInfo.tid
new file mode 100644
index 000000000..a962ef10d
--- /dev/null
+++ b/core/wiki/ConfigInfo.tid
@@ -0,0 +1,18 @@
+title: $:/ConfigInfo
+
+This tiddler displays the internal configuration of this wiki, which can be useful for troubleshooting, or just to help understand how TiddlyWiki5 works.
+
+! Tiddler fields
+
+This is the full set of TiddlerFields in use in this wiki (including system tiddlers but excluding shadow tiddlers).
+
+<$fieldlist all>
+<$info type="currentField"/>
+</$fieldlist>
+
+! Loaded Modules
+
+These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
+
+<$info type="modules"/>
+
diff --git a/core/wiki/ControlPanel.tid b/core/wiki/ControlPanel.tid
index c7a3d6ed0..8618b119a 100644
--- a/core/wiki/ControlPanel.tid
+++ b/core/wiki/ControlPanel.tid
@@ -31,3 +31,7 @@ The tiddlers in TiddlyWiki documents can be securely encrypted by specifying a p
 {{$:/snippets/themeswitcher}}
 
 {{$:/core/ui/ServerControlPanel}}
+
+! Advanced
+
+[[Internal configuration information|$:/ConfigInfo]]