diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile
index c11c80dd2b..ffd1010ac1 100644
--- a/util/optionlist/Makefile
+++ b/util/optionlist/Makefile
@@ -1,7 +1,13 @@
-all:
+all: html wiki
+
+html:
 	./mkOptionList.py
 	@#saxon  Options.xml Options.xsl >Options.html
 	xsltproc Options.xsl Options.xml > Options.html
 	
+wiki:
+	./mkOptionList.py
+	xsltproc Options-wiki.xsl Options.xml > Options.wiki
+
 clean:
-	rm Options.xml Options.html
+	rm -rf Options.xml Options.html Options.wiki
diff --git a/util/optionlist/Options-wiki.xsl b/util/optionlist/Options-wiki.xsl
new file mode 100644
index 0000000000..9ab147f05b
--- /dev/null
+++ b/util/optionlist/Options-wiki.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output method="text"
+            encoding="utf-8"
+	    indent="yes" />
+
+<xsl:template match="/">
+==LinuxBIOS Options==
+
+This is an automatically generated list of LinuxBIOS compile time
+options. Created at <xsl:value-of select="//creationdate"/>.
+
+{| border="1"
+|- bgcolor="#0975a7"
+! align="left" | Option
+! align="left" | Comment
+! align="left" | Default
+! align="left" | Export
+! align="left" | Format<xsl:for-each select="options/option">
+|- 
+| <xsl:value-of select="@name"/>
+| <xsl:value-of select="comment"/>
+| <xsl:value-of select="default"/>
+| <xsl:value-of select="export"/>
+| <xsl:value-of select="format"/>
+</xsl:for-each>
+|} 
+
+
+</xsl:template>
+</xsl:stylesheet>