diff --git a/my.cnf b/my.cnf
index fae0fa2..692a4bb 100644
--- a/my.cnf
+++ b/my.cnf
@@ -1,7 +1,10 @@
 [mysqld]
+# Settings user and group are ignored when systemd is used.
+# If you need to run mysqld under different user or group, 
+# customize your systemd unit file for mysqld according to the
+# instructions in http://fedoraproject.org/wiki/Systemd
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
-user=mysql
 # Disabling symbolic-links is recommended to prevent assorted security risks
 symbolic-links=0
 
diff --git a/mysql.spec b/mysql.spec
index 61eda79..d420c11 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -659,6 +659,8 @@ fi
 * Wed Nov 02 2011 Honza Horak <hhorak@redhat.com> 5.5.16-4
 - Don't assume all ethernet devices are named ethX
 Resolves: #682365
+- Exclude user definition from my.cnf, user is defined in mysqld.service now
+Resolves: #661265
 
 * Sun Oct 16 2011 Tom Lane <tgl@redhat.com> 5.5.16-3
 - Fix unportable usage associated with va_list arguments