diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3e829a908df38a677b34b9ac67b25a09b7fa5ad..9ed2d412cc5a69e515216645019f1fb529ee4c3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v1.0 beta 2 [unreleased]
+
+### Features
+
+### Bugfixes
+
+- [#1330](https://github.com/influxdata/telegraf/issues/1330): Fix exec plugin panic when using single binary
+- [#1336](https://github.com/influxdata/telegraf/issues/1336): Fixed incorrect prometheus metrics source selection
+
 ## v1.0 beta 1 [2016-06-07]
 
 ### Release Notes
@@ -50,7 +59,6 @@ time before a new metric is included by the plugin.
 - [#1316](https://github.com/influxdata/telegraf/pull/1316): Removed leaked "database" tag on redis metrics. Thanks @PierreF!
 - [#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.
-- [#1336](https://github.com/influxdata/telegraf/issues/1336): Fixed incorrect prometheus metrics source selection
 
 ## v0.13.1 [2016-05-24]
 
diff --git a/plugins/inputs/exec/exec.go b/plugins/inputs/exec/exec.go
index 415831960d4aa88887660e1ee2300cbad0700b22..c8d4cee50faa4b6e9d41e5b4cd1a7021a0be02b2 100644
--- a/plugins/inputs/exec/exec.go
+++ b/plugins/inputs/exec/exec.go
@@ -177,8 +177,12 @@ func (e *Exec) Gather(acc telegraf.Accumulator) error {
 			// There were matches, so we'll append each match together with
 			// the arguments to the commands slice
 			for _, match := range matches {
-				commands = append(
-					commands, strings.Join([]string{match, cmdAndArgs[1]}, " "))
+				if len(cmdAndArgs) == 1 {
+					commands = append(commands, match)
+				} else {
+					commands = append(commands,
+						strings.Join([]string{match, cmdAndArgs[1]}, " "))
+				}
 			}
 		}
 	}