diff --git a/doc/README.urpmi b/doc/README.urpmi
index 719ac8249f3..ce8fb706703 100644
--- a/doc/README.urpmi
+++ b/doc/README.urpmi
@@ -18,7 +18,7 @@ unix user name):
 
     $ su -
     # su - postgres
-    $ createuser tinyerp
+    $ createuser openerp
     Shall the new user be allowed to create databases? (y/n) y
     Shall the new user be allowed to create more new users? (y/n) y
     CREATE USER
diff --git a/doc/README.userchange b/doc/README.userchange
new file mode 100644
index 00000000000..f6cc0ab0666
--- /dev/null
+++ b/doc/README.userchange
@@ -0,0 +1,31 @@
+Important note for OpenERP build >= 5.0.1-11xrg:
+
+THE USERNAME HAS CHANGED!!
+
+Former user "tinyerp" is now called "openerp".
+
+
+For that, you will have to make sure the following files are chowned
+to the new user:
+
+/var/log/openerp
+/var/spool/openerp
+/var/run/openerp
+/etc/openerp
+/etc/openerp/cert.cfg
+/etc/openerp-server.conf
+/etc/logrotate.d/openerp-server
+
+Then, rename the user in the postgres database:
+
+ psql -U postgres postgres
+ 
+ ALTER ROLE tinyerp RENAME TO openerp;
+ 
+Then, edit your openerp-server.conf to depict the change:
+- db_user = tinyerp
++ db_user = openerp
+
+Good luck!
+
+
diff --git a/doc/openerp-server.conf b/doc/openerp-server.conf
index 668b4aaf7cb..3b58a008329 100644
--- a/doc/openerp-server.conf
+++ b/doc/openerp-server.conf
@@ -13,7 +13,7 @@ db_port = False
 ; Please uncomment the following line *after* you have created the
 ; database. It activates the auto module check on startup.
 ; db_name = terp
-db_user = tinyerp
+db_user = openerp
 db_password = False
 ; Uncomment these for xml-rpc over SSL
 ; secure = True
diff --git a/doc/openerp-server.init b/doc/openerp-server.init
index 01d2b7b6b33..d9cc35362f9 100644
--- a/doc/openerp-server.init
+++ b/doc/openerp-server.init
@@ -51,7 +51,7 @@ RETVAL=0
 
 start() {
     echo -n $"Starting $desc ($prog): "
-    daemon --user tinyerp --check openerp-server \
+    daemon --user openerp --check openerp-server \
     "/usr/bin/setsid /usr/bin/openerp-server \
     -c /etc/openerp-server.conf \
     --pidfile=$PIDFILE \