diff --git a/core/modules/macros/dumpvariables.js b/core/modules/macros/dumpvariables.js
deleted file mode 100644
index 248beae96..000000000
--- a/core/modules/macros/dumpvariables.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*\
-title: $:/core/modules/macros/dumpvariables.js
-type: application/javascript
-module-type: macro
-
-Macro to dump all active variable values
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Information about this macro
-*/
-
-exports.name = "dumpvariables";
-
-exports.params = [
-];
-
-/*
-Run the macro
-*/
-exports.run = function() {
-	var output = ["|!Variable |!Value |"],
-		variables = [], variable;
-	for(variable in this.variables) {
-		variables.push(variable);
-	}
-	variables.sort();
-	for(var index=0; index<variables.length; index++) {
-		var variable = variables[index];
-		output.push("|" + variable + " |<input size=50 value=<<" + variable + ">>/> |")
-	}
-	return output.join("\n");
-};
-
-})();
diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
new file mode 100644
index 000000000..d713fd073
--- /dev/null
+++ b/core/wiki/macros/dumpvariables.tid
@@ -0,0 +1,13 @@
+title: $:/core/macros/dumpvariables
+tags: $:/tags/Macro
+
+\define dumpvariables()
+<ul>
+<$list filter="[variables[]]" variable="varname">
+<li>
+<strong><code><$text text=<<varname>>/></code></strong>:<br/>
+<$codeblock code={{{ [<varname>getvariable[]] }}}/>
+</li>
+</$list>
+</ul>
+\end