diff --git a/class.phpmailer.php b/class.phpmailer.php
index e1d93de2..e9f41755 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -7,7 +7,7 @@
 | ------------------------------------------------------------------------- |
 |     Admin: Jim Jagielski (project admininistrator)                        |
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
+|          : Marcus Bointon (coolbru) phpmailer@synchromedia.co.uk          |
 |          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
 |   Founder: Brent R. Matzelle (original founder)                           |
 | Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..103109d6
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "phpmailer/phpmailer",
+    "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+    "authors": [
+        {
+            "name": "Jim Jagielski",
+            "email": "jimjag@gmail.com"
+        },
+        {
+            "name": "Marcus Bointon",
+            "email": "phpmailer@synchromedia.co.uk"
+        },
+        {
+            "name": "Andy Prevost",
+            "email": "codeworxtech@users.sourceforge.net"
+        },
+        {
+            "name": "Brent R. Matzelle"
+        }
+    ],
+    "require": {
+        "php": ">=5.0.0"
+    },
+    "require-dev": {
+        "phpdocumentor/phpdocumentor": "*",
+        "phpunit/phpunit": "*"
+    },
+    "autoload": {
+        "classmap": ["class.phpmailer.php", "class.pop3.php", "class.smtp.php"]
+    }
+}
\ No newline at end of file