diff --git a/src/ejabberd.app.src.script b/src/ejabberd.app.src.script
index aed4d2158..eea011546 100644
--- a/src/ejabberd.app.src.script
+++ b/src/ejabberd.app.src.script
@@ -1,22 +1,16 @@
-%% $Id$
 Vars = case file:consult(filename:join([filename:dirname(SCRIPT), "..", "vars.config"])) of
     {ok, Terms} ->
-        Terms;
+        [lists:keyfind(description, 1, Terms),
+         lists:keyfind(vsn, 1, Terms),
+         {env, [lists:keyfind(enabled_backends, 1, Terms)]}
+        ];
     _Err ->
         []
     end,
 
-Env = case lists:keyfind(enabled_backends, 1, Vars) of
-    false ->
-        {env, []};
-    Backends ->
-        {env, [Backends]}
-    end,
-
 {application, ejabberd,
- [{description, "ejabberd"},
-  lists:keyfind(vsn, 1, Vars),
-  {modules, []},
+ Vars ++
+ [{modules, []},
   {registered, []},
   {applications, [kernel, stdlib, sasl, ssl]},
   {included_applications,
@@ -31,10 +25,8 @@ Env = case lists:keyfind(enabled_backends, 1, Vars) of
      xmpp,
      cache_tab,
      eimp]},
-  Env,
   {mod, {ejabberd_app, []}}]}.
 
-
 %% Local Variables:
 %% mode: erlang
 %% End:
diff --git a/vars.config.in b/vars.config.in
index 824e1e59d..696c761f8 100644
--- a/vars.config.in
+++ b/vars.config.in
@@ -45,7 +45,7 @@
 {vsn, "@PACKAGE_VERSION@"}.
 
 %% Variables for overlay template files
-{package_name, "@PACKAGE_NAME@"}.
+{description, "@PACKAGE_NAME@"}.
 {enabled_backends, [@enabled_backends@]}.
 
 %% Platform-specific installation paths