diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py
index b66d7eedcf6..2391737c425 100644
--- a/bin/addons/base/ir/ir_ui_view.py
+++ b/bin/addons/base/ir/ir_ui_view.py
@@ -59,6 +59,7 @@ class view(osv.osv):
             ('mdx','mdx'),
             ('graph', 'Graph'),
             ('calendar', 'Calendar'),
+            ('diagram','Diagram'),
             ('gantt', 'Gantt'),
             ('search','Search')), 'View Type', required=True),
         'arch': fields.text('View Architecture', required=True),
diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml
index a0bfb7fdc03..6d3ddf9f5cc 100644
--- a/bin/addons/base/ir/workflow/workflow_view.xml
+++ b/bin/addons/base/ir/workflow/workflow_view.xml
@@ -23,6 +23,22 @@
                 </form>
             </field>
         </record>
+        
+        <record id="view_workflow_diagram" model="ir.ui.view">
+            <field name="name">workflow.diagram</field>
+            <field name="model">workflow</field>
+            <field name="type">diagram</field>
+            <field name="arch" type="xml">
+                <diagram string="Workflow Editor">
+				  <node object="workflow.activity">
+				    <field name="name"/>
+				  </node>
+				  <arrow object="workflow.transition" source="activity_from" destination="activity_to">
+				    <field name="name"/>
+				  </arrow>
+				</diagram> 
+            </field>
+        </record>
         <record id="view_workflow_tree" model="ir.ui.view">
             <field name="name">workflow.tree</field>
             <field name="model">workflow</field>
@@ -41,6 +57,7 @@
             <field name="res_model">workflow</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_workflow_tree"/>
+            <field name="view_mode">tree,form,diagram</field>
         </record>
         <menuitem action="action_workflow_form" id="menu_workflow" parent="base.menu_workflow_root"/>
 
diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng
index 3a9c8f92369..82112a834c7 100644
--- a/bin/addons/base/rng/view.rng
+++ b/bin/addons/base/rng/view.rng
@@ -30,6 +30,42 @@
         </rng:element>
     </rng:define>
 
+    <rng:define name="diagram">
+        <rng:element name="diagram">
+            <rng:optional><rng:attribute name="string"/></rng:optional>            
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="node"/>
+                    <rng:ref name="arrow"/>
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+    
+    <rng:define name="node">
+        <rng:element name="node">
+            <rng:attribute name="object" />           
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="field"/>                    
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+    
+    <rng:define name="arrow">
+        <rng:element name="arrow">
+            <rng:attribute name="object" />
+            <rng:attribute name="source" />
+            <rng:attribute name="destination" />           
+            <rng:zeroOrMore>
+                <rng:choice>
+                    <rng:ref name="field"/>                    
+                </rng:choice>
+            </rng:zeroOrMore>
+        </rng:element>
+    </rng:define>
+    
     <rng:define name="tree">
         <rng:element name="tree">
             <rng:optional><rng:attribute name="string"/></rng:optional>
@@ -332,6 +368,7 @@
             <rng:optional><rng:attribute name="selection"/></rng:optional>            
             <rng:zeroOrMore>
                 <rng:choice>
+                    <rng:ref name="diagram"/>
                     <rng:ref name="attribute" />
                     <rng:ref name="form"/>
                     <rng:ref name="data"/>
@@ -507,6 +544,7 @@
 	
     <rng:start>
         <rng:choice>
+            <rng:ref name="diagram" />
             <rng:ref name="form" />
             <rng:ref name="search" />            
             <rng:ref name="group" />