diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
index 8e3fd52..328dfec 100644
--- a/docs/HISTORY.txt
+++ b/docs/HISTORY.txt
@@ -15,6 +15,8 @@ Changelog
 
 * Do not exclude content types which are not allowed in navigation [ebrehault]
 
+* Add support for plone.formwidget.autocomplete 2.0 [do3cc]
+
 1.0.6 (2012-09-28)
 ------------------
 
diff --git a/plone/formwidget/contenttree/input.pt b/plone/formwidget/contenttree/input.pt
index 43f7b4e..8a4069f 100644
--- a/plone/formwidget/contenttree/input.pt
+++ b/plone/formwidget/contenttree/input.pt
@@ -1,7 +1,12 @@
 <i18n:domain i18n:domain="plone.formwidget.contenttree">
-	<div tal:attributes="id string:${view/id}-autocomplete">
+	<div tal:attributes="id string:${view/id}-autocomplete;
+                         class view/css_class_for_autocomplete_initalization">
 	    <div tal:attributes="id string:${view/id}-input-fields" class="autocompleteInputWidget"
 	         tal:content="structure view/renderQueryWidget" />
+        <span class="autocomplete_options hidden_structure"
+            tal:attributes="data-source view/autocomplete_url;
+                            data-minLength view/minLength"/>
+
 	    <tal:block replace="structure view/subform/render" />
 	</div>
 	<div class="contenttreeWindow"