diff --git a/src/lager.app.src b/src/lager.app.src
index 23f69d2..727e6ef 100644
--- a/src/lager.app.src
+++ b/src/lager.app.src
@@ -2,7 +2,7 @@
 %% ex: ts=4 sw=4 et
 {application, lager,
  [
-  {description, "Custom error handler"},
+  {description, "Erlang logging framework"},
   {vsn, "1.0.0"},
   {modules, [
             ]},
@@ -12,7 +12,7 @@
                   sasl
                  ]},
   {registered, []},
-  {mod, {riak_err_app, []}},
+  {mod, {lager_app, []}},
   {env, [
         ]}
  ]}.
diff --git a/src/lager_app.erl b/src/lager_app.erl
new file mode 100644
index 0000000..f30815d
--- /dev/null
+++ b/src/lager_app.erl
@@ -0,0 +1,32 @@
+%% Copyright (c) 2011 Basho Technologies, Inc.  All Rights Reserved.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+
+-module(lager_app).
+
+-behaviour(application).
+
+-export([start/0,
+         start/2,
+         stop/1]).
+
+start() ->
+    application:start(lager).
+
+start(_StartType, _StartArgs) ->
+    lager_sup:start_link().
+
+stop(_State) ->
+    ok.
diff --git a/src/lager_sup.erl b/src/lager_sup.erl
new file mode 100644
index 0000000..0a0e1ac
--- /dev/null
+++ b/src/lager_sup.erl
@@ -0,0 +1,32 @@
+%% Copyright (c) 2011 Basho Technologies, Inc.  All Rights Reserved.
+%%
+%% This file is provided to you under the Apache License,
+%% Version 2.0 (the "License"); you may not use this file
+%% except in compliance with the License.  You may obtain
+%% a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied.  See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+
+-module(lager_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+
+%% Callbacks
+-export([init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+init([]) ->
+    {ok, {{one_for_all, 1000, 3600},
+            [{lager, {lager, start_link, []}, permanent, 5000, worker, [lager]}]}}.