diff --git a/ChangeLog b/ChangeLog
index 3a481c11..558877a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-06  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Return const reference.
+	* src/LpdMessageReceiver.h
+	* src/LpdReceiveMessageCommand.h
+
 2010-05-06  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed useless pathJoin
diff --git a/src/LpdMessageReceiver.h b/src/LpdMessageReceiver.h
index 9b4a07be..879a1797 100644
--- a/src/LpdMessageReceiver.h
+++ b/src/LpdMessageReceiver.h
@@ -66,7 +66,7 @@ public:
   // then returns SharedHandle<LpdMessage>(new LpdMessage())
   SharedHandle<LpdMessage> receiveMessage();
 
-  SharedHandle<SocketCore> getSocket() const
+  const SharedHandle<SocketCore>& getSocket() const
   {
     return _socket;
   }
diff --git a/src/LpdReceiveMessageCommand.h b/src/LpdReceiveMessageCommand.h
index 28f9a248..9cd2dbbb 100644
--- a/src/LpdReceiveMessageCommand.h
+++ b/src/LpdReceiveMessageCommand.h
@@ -63,7 +63,7 @@ public:
 
   virtual bool execute();
 
-  SharedHandle<LpdMessageReceiver> getLpdMessageReceiver() const
+  const SharedHandle<LpdMessageReceiver>& getLpdMessageReceiver() const
   {
     return _receiver;
   }