diff --git a/openerp/addons/base/__init__.py b/openerp/addons/base/__init__.py
index d666a6abbf7..a5bc4c59484 100644
--- a/openerp/addons/base/__init__.py
+++ b/openerp/addons/base/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import ir
+import workflow
 import module
 import res
 import report
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index a3d630439e7..808dd18d3e5 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -57,7 +57,7 @@ The kernel of OpenERP, needed for all installation.
         'ir/ir_values_view.xml',
         'ir/osv_memory_autovacuum.xml',
         'ir/ir_model_report.xml',
-        'ir/workflow_view.xml',
+        'workflow/workflow_view.xml',
         'module/module_view.xml',
         'module/module_data.xml',
         'module/module_report.xml',
diff --git a/openerp/addons/base/ir/__init__.py b/openerp/addons/base/ir/__init__.py
index df6e0ac645c..35184f7a565 100644
--- a/openerp/addons/base/ir/__init__.py
+++ b/openerp/addons/base/ir/__init__.py
@@ -32,8 +32,6 @@ import ir_filters
 import ir_values
 import ir_translation
 import ir_exports
-import workflow
-import workflow_report
 import ir_rule
 import ir_config_parameter
 import osv_memory_autovacuum
diff --git a/openerp/addons/base/workflow/__init__.py b/openerp/addons/base/workflow/__init__.py
new file mode 100644
index 00000000000..45a9f36fa36
--- /dev/null
+++ b/openerp/addons/base/workflow/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+import workflow
+import workflow_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/openerp/addons/base/ir/workflow.py b/openerp/addons/base/workflow/workflow.py
similarity index 100%
rename from openerp/addons/base/ir/workflow.py
rename to openerp/addons/base/workflow/workflow.py
diff --git a/openerp/addons/base/ir/workflow_report.py b/openerp/addons/base/workflow/workflow_report.py
similarity index 100%
rename from openerp/addons/base/ir/workflow_report.py
rename to openerp/addons/base/workflow/workflow_report.py
diff --git a/openerp/addons/base/ir/workflow_view.xml b/openerp/addons/base/workflow/workflow_view.xml
similarity index 100%
rename from openerp/addons/base/ir/workflow_view.xml
rename to openerp/addons/base/workflow/workflow_view.xml