diff --git a/src/Monolog/Handler/SocketHandler/Exception/ConnectionException.php b/src/Monolog/Handler/SocketHandler/Exception/ConnectionException.php
index c43541c4..fd183687 100644
--- a/src/Monolog/Handler/SocketHandler/Exception/ConnectionException.php
+++ b/src/Monolog/Handler/SocketHandler/Exception/ConnectionException.php
@@ -1,6 +1,12 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Monolog\Handler\SocketHandler\Exception;
diff --git a/src/Monolog/Handler/SocketHandler/Exception/WriteToSocketException.php b/src/Monolog/Handler/SocketHandler/Exception/WriteToSocketException.php
index 4843f2e6..c03c1b63 100644
--- a/src/Monolog/Handler/SocketHandler/Exception/WriteToSocketException.php
+++ b/src/Monolog/Handler/SocketHandler/Exception/WriteToSocketException.php
@@ -1,8 +1,13 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
- */
 
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Monolog\Handler\SocketHandler\Exception;
 
diff --git a/src/Monolog/Handler/SocketHandler/MockSocket.php b/src/Monolog/Handler/SocketHandler/MockSocket.php
index 885ffabb..2826433d 100644
--- a/src/Monolog/Handler/SocketHandler/MockSocket.php
+++ b/src/Monolog/Handler/SocketHandler/MockSocket.php
@@ -1,8 +1,13 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
- */
 
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Monolog\Handler\SocketHandler;
 
diff --git a/src/Monolog/Handler/SocketHandler/PersistentSocket.php b/src/Monolog/Handler/SocketHandler/PersistentSocket.php
index 9facb40e..c4a2d788 100644
--- a/src/Monolog/Handler/SocketHandler/PersistentSocket.php
+++ b/src/Monolog/Handler/SocketHandler/PersistentSocket.php
@@ -1,6 +1,12 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Monolog\Handler\SocketHandler;
@@ -11,10 +17,12 @@ use Monolog\Handler\SocketHandler\Exception\ConnectionException;
  * Same as Socket but uses pfsockopen() instead allowing the connection to be reused in other requests.
  * 
  * @see http://php.net/manual/en/function.pfsockopen.php
+ * @author Pablo de Leon Belloc <pablolb@gmail.com>
  */
 class PersistentSocket extends Socket
 {
-    protected function createSocketResource() {
+    protected function createSocketResource()
+    {
         @$resource = pfsockopen($this->connectionString, -1, $errno, $errstr, $this->connectionTimeout);
         if (!$resource) {
             throw new ConnectionException("Failed connecting to $this->connectionString ($errno: $errstr)");
diff --git a/src/Monolog/Handler/SocketHandler/Socket.php b/src/Monolog/Handler/SocketHandler/Socket.php
index ede89f54..281d162f 100644
--- a/src/Monolog/Handler/SocketHandler/Socket.php
+++ b/src/Monolog/Handler/SocketHandler/Socket.php
@@ -1,6 +1,12 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace Monolog\Handler\SocketHandler;
@@ -13,6 +19,7 @@ use Monolog\Handler\SocketHandler\Exception\WriteToSocketException;
  * Timeout settings must be set before first write to have any effect.
  * 
  * @see http://php.net/manual/en/function.fsockopen.php
+ * @author Pablo de Leon Belloc <pablolb@gmail.com>
  */
 class Socket
 {
diff --git a/tests/Monolog/Handler/SocketHandler/SocketTest.php b/tests/Monolog/Handler/SocketHandler/SocketTest.php
index 7e12cbb6..cc5b237a 100644
--- a/tests/Monolog/Handler/SocketHandler/SocketTest.php
+++ b/tests/Monolog/Handler/SocketHandler/SocketTest.php
@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Monolog\Handler\SocketHandler;
 
 class SocketTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Monolog/Handler/SocketHandlerTest.php b/tests/Monolog/Handler/SocketHandlerTest.php
index 69eb3d71..cc5c9201 100644
--- a/tests/Monolog/Handler/SocketHandlerTest.php
+++ b/tests/Monolog/Handler/SocketHandlerTest.php
@@ -1,8 +1,13 @@
 <?php
-/**
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
- */
 
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Monolog\Handler;
 
@@ -13,6 +18,11 @@ use Monolog\Handler\SocketHandler\PersistentSocket;
 use Monolog\TestCase;
 use Monolog\Logger;
 
+
+
+/**
+ * @author Pablo de Leon Belloc <pablolb@gmail.com>
+ */
 class SocketHandlerTest extends TestCase
 {
     public function testWrite()