diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index a573c70dc0..767ad88df2 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-03  Koichiro KIKUCHI <koichiro@rworks.jp>
+
+	* pandora_agent: Allow spaces in module group names.
+
 2014-05-26  Sancho Lerena <slerena@artica.es>
 
 	* pandora_agent_installer: Fixed installed for Darwin/macOS agent. Tested
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 7489e0ed2e..fdc9cbfd23 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -530,7 +530,7 @@ sub parse_conf_modules($) {
 		} elsif ($line =~ /^\s*module_unit\s+(.*)\s*$/) {
 			$module->{'unit'} = $1;
 		# Module_group
-		} elsif ($line =~ /^\s*module_group\s+(\S+)\s*$/) {
+		} elsif ($line =~ /^\s*module_group\s+(.*?)\s*$/) {
 			$module->{'module_group'} = $1;
 		# Custom id
 		} elsif ($line =~ /^\s*module_custom_id\s+(.*)\s*$/) {