diff --git a/.gitignore b/.gitignore
index e7e1805..1cb564d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,8 @@
 /tests/*.log
 /tests/*.out
 /tests/sqlite-log.db
+
+# composer related
+composer.lock
+composer.phar
+vendor
diff --git a/composer.json b/composer.json
index 0b643a3..5c655e8 100644
--- a/composer.json
+++ b/composer.json
@@ -2,21 +2,39 @@
     "name": "pear/log",
     "type": "library",
     "description": "PEAR Logging Framework",
-    "keywords": ["log","logging"],
+    "keywords": [
+        "log",
+        "logging"
+    ],
     "homepage": "https://github.com/pear/Log",
     "license": "MIT",
     "require": {
-        "php" : ">5.2"
+        "php": ">5.2",
+        "pear/pear_exception": "*"
     },
     "autoload": {
-        "classmap": ["Log/", "Log.php"]
+        "psr-0": {
+            "Log": "./"
+        }
     },
-    "include-path": [""],
+    "include-path": [
+        ""
+    ],
     "authors": [
         {
             "name": "Jon Parise",
             "email": "jon@php.net",
             "role": "Developer"
         }
-    ]
-}
+    ],
+    "support": {
+        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Log",
+        "source": "https://github.com/pear/Log"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*"
+    },
+    "suggest": {
+        "pear/db": "Install optionally via your project's composer.json"
+    }
+}
\ No newline at end of file