diff --git a/mozilla/extensions/canvas3d/Makefile.in b/mozilla/extensions/canvas3d/Makefile.in
index 72dd4082e91..876ea37c144 100644
--- a/mozilla/extensions/canvas3d/Makefile.in
+++ b/mozilla/extensions/canvas3d/Makefile.in
@@ -1,4 +1,4 @@
-# 
+#
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
@@ -49,8 +49,8 @@ DIRS            = public src
 XPI_NAME	= canvas3d
 INSTALL_EXTENSION_ID = canvas3d@mozilla.com
 XPI_PKGNAME	= canvas3d
+USE_EXTENSION_MANIFEST = 1
 
 DIST_FILES = install.rdf
 
 include $(topsrcdir)/config/rules.mk
-
diff --git a/mozilla/extensions/canvas3d/install.rdf b/mozilla/extensions/canvas3d/install.rdf
index b865af38d7f..f0efb832555 100644
--- a/mozilla/extensions/canvas3d/install.rdf
+++ b/mozilla/extensions/canvas3d/install.rdf
@@ -12,19 +12,20 @@
       <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-	<!-- this version needs to be set to the exact version this 
+	<!-- this version needs to be set to the exact version this
 	     extension was built for, because of the way we're tied
 	     to internal interfaces.
 	  -->
-        <em:minVersion>3.0a4pre</em:minVersion>
-        <em:maxVersion>3.0a4pre</em:maxVersion>
+        <em:minVersion>3.0a8pre</em:minVersion>
+        <em:maxVersion>3.0a8pre</em:maxVersion>
       </Description>
     </em:targetApplication>
-	
+
     <!-- front-end metadata -->
     <em:creator>Vladimir Vukicevic/mozilla.com</em:creator>
     <em:name>Canvas 3D (Gecko 1.9)</em:name>
     <em:description>Canvas 3D context(s) for Gecko 1.9</em:description>
     <em:homepageURL>http://people.mozilla.com/~vladimir/canvas3d/</em:homepageURL>
+    <em:optionsURL>chrome://canvas3d/content/options.xul</em:optionsURL>
   </Description>
 </RDF>
diff --git a/mozilla/extensions/canvas3d/jar.mn b/mozilla/extensions/canvas3d/jar.mn
new file mode 100644
index 00000000000..1b896f7355d
--- /dev/null
+++ b/mozilla/extensions/canvas3d/jar.mn
@@ -0,0 +1,3 @@
+canvas3d.jar:
+% content canvas3d %content/canvas3d/
+  content/canvas3d/options.xul                   (resources/content/options.xul)
diff --git a/mozilla/extensions/canvas3d/resources/content/options.xul b/mozilla/extensions/canvas3d/resources/content/options.xul
new file mode 100644
index 00000000000..ccb0207e489
--- /dev/null
+++ b/mozilla/extensions/canvas3d/resources/content/options.xul
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+
+<prefwindow id="canvas3d-options" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <prefpane>
+    <preferences>
+      <preference id="webcontent" name="extensions.canvas3d.enabledForWebContent" type="bool"/>
+    </preferences>
+
+    <checkbox label="Enable 3D canvas in web content" preference="webcontent"/>
+
+  </prefpane>
+</prefwindow>