diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index a8452cff85..d109621936 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-28  Junichi Satoh  <junichi@rworks.jp>
+
+	* pandora_agent: Improved to be able to use CRLF in pandora_agent.conf.
+
 2012-08-15  Junichi Satoh  <junichi@rworks.jp>
 
 	* pandora_agent: Changed not to use thread library when agent_threads
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 25a738faac..600651c974 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -576,6 +576,9 @@ sub read_config (;$) {
 	foreach my $line (@file){
 		# Skip comments and empty lines
 		next if ($line =~ m/^\s*#/) or ($line =~ m/^\s*$/);
+
+		# Replace CRLF with LF
+		$line =~ s/\r\n/\n/g;
 		
 		# Token search
 		if (defined ($token)) {