diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2af382958..02c0d4bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -125,6 +125,7 @@ consistent with the behavior of `collection_jitter`.
 - [#1323](https://github.com/influxdata/telegraf/issues/1323): Processes plugin: fix potential error with /proc/net/stat directory.
 - [#1322](https://github.com/influxdata/telegraf/issues/1322): Fix rare RHEL 5.2 panic in gopsutil diskio gathering function.
 - [#1586](https://github.com/influxdata/telegraf/pull/1586): Remove IF NOT EXISTS from influxdb output database creation.
+- [#1600](https://github.com/influxdata/telegraf/issues/1600): Fix quoting with text values in postgresql_extensible plugin.
 
 ## v0.13.1 [2016-05-24]
 
diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
index 75bc6b936..ec281fca2 100644
--- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go
+++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go
@@ -266,29 +266,33 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
 	tags := map[string]string{}
 	tags["server"] = tagAddress
 	tags["db"] = dbname.String()
-	var isATag int
 	fields := make(map[string]interface{})
+COLUMN:
 	for col, val := range columnMap {
 		if acc.Debug() {
 			log.Printf("postgresql_extensible: column: %s = %T: %s\n", col, *val, *val)
 		}
 		_, ignore := ignoredColumns[col]
-		if !ignore && *val != nil {
-			isATag = 0
-			for tag := range p.AdditionalTags {
-				if col == p.AdditionalTags[tag] {
-					isATag = 1
-					value_type_p := fmt.Sprintf(`%T`, *val)
-					if value_type_p == "[]uint8" {
-						tags[col] = fmt.Sprintf(`%s`, *val)
-					} else if value_type_p == "int64" {
-						tags[col] = fmt.Sprintf(`%v`, *val)
-					}
-				}
+		if ignore || *val == nil {
+			continue
+		}
+		for _, tag := range p.AdditionalTags {
+			if col != tag {
+				continue
 			}
-			if isATag == 0 {
-				fields[col] = *val
+			switch v := (*val).(type) {
+			case []byte:
+				tags[col] = string(v)
+			case int64:
+				tags[col] = fmt.Sprintf("%d", v)
 			}
+			continue COLUMN
+		}
+
+		if v, ok := (*val).([]byte); ok {
+			fields[col] = string(v)
+		} else {
+			fields[col] = *val
 		}
 	}
 	acc.AddFields(meas_name, fields, tags)