diff --git a/NEWS b/NEWS
index 5c462581e336656e56f7534ff290f108b96f1bfc..f620a6fba92a7c13c35339dd9feadfa6a0d037a0 100644
--- a/NEWS
+++ b/NEWS
@@ -296,6 +296,8 @@ documents those changes that are of interest to users and administrators.
  -- Handle association correctly if using FAIR_TREE as well as shares=Parent
  -- Fix race condition when setting priority of a job and the association
     doesn't have a parent.
+ -- MYSQL - Fix issue with adding a reservation if the name has single quotes in
+    it.
 
 * Changes in Slurm 15.08.12
 ===========================
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index 3742c18e20c01f49cd9b14489233591176fc52df..2a708a643bd000d56eab34fa1d2d0eb9dd172a03 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -189,7 +189,7 @@ in\-turn update the underlying associations.
 .TP
 \fIcluster\fP
 The \fIClusterName\fR parameter in the \fIslurm.conf\fR configuration
-file, used to differentiate accounts from on different machines.
+file, used to differentiate accounts on different machines.
 
 .TP
 \fIconfiguration\fP
@@ -719,11 +719,6 @@ controller is placed here.
 When a slurmctld registers with the database the port the controller
 is listening on is placed here.
 
-.TP
-\fITRES\fP
-Trackable RESources (BB (Burst buffer), CPU, Energy, GRES, License, Memory, and
-Node) this cluster is accounting for.
-
 .TP
 \fIFlags\fP
 Attributes possessed by the cluster.
@@ -744,6 +739,12 @@ The numeric value of the select plugin the cluster is using.
 \fIRPC\fP
 When a slurmctld registers with the database the rpc version the controller
 is running is placed here.
+
+.TP
+\fITRES\fP
+Trackable RESources (BB (Burst buffer), CPU, Energy, GRES, License, Memory, and
+Node) this cluster is accounting for.
+
 .P
 NOTE: You can also view the information about the root association for
 the cluster.  The Association format fields are described
@@ -851,10 +852,6 @@ The name of the cluster event happened on.
 \fIClusterNodes\fP
 The hostlist of nodes on a cluster in a cluster event.
 
-.TP
-\fITRES\fP
-Number of TRES involved with the event.
-
 .TP
 \fIDuration\fP
 Time period the event was around for.
@@ -892,6 +889,10 @@ On a node event this is the formatted state of the node during the event.
 On a node event this is the numeric value of the state of the node
 during the event.
 
+.TP
+\fITRES\fP
+Number of TRES involved with the event.
+
 .TP
 \fIUser\fP
 On a node event this is the user who caused the event to happen.
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_resv.c b/src/plugins/accounting_storage/mysql/as_mysql_resv.c
index 28d0649dbffedcbde4b77f8ce89946795ec5292d..bfe7b9a38e3edf07c2679394573416dd73e4bf92 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_resv.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_resv.c
@@ -98,9 +98,11 @@ static int _setup_resv_limits(slurmdb_reservation_rec_t *resv,
 	}
 
 	if (resv->name) {
+		char *tmp_char = slurm_add_slash_to_quotes(resv->name);
 		xstrcat(*cols, ", resv_name");
-		xstrfmtcat(*vals, ", '%s'", resv->name);
-		xstrfmtcat(*extra, ", resv_name='%s'", resv->name);
+		xstrfmtcat(*vals, ", '%s'", tmp_char);
+		xstrfmtcat(*extra, ", resv_name='%s'", tmp_char);
+		xfree(tmp_char);
 	}
 
 	if (resv->nodes) {