diff --git a/.gitignore b/.gitignore
index 21f8cfada..eb54d51e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ XmppAddr.hrl
 /test/*.beam
 /logs/
 /priv/sql
+/rel/ejabberd
diff --git a/config/config.exs b/config/config.exs
new file mode 100644
index 000000000..8b68e8dbf
--- /dev/null
+++ b/config/config.exs
@@ -0,0 +1,10 @@
+use Mix.Config
+
+# This is standard path in the context of ejabberd release
+config :ejabberd,
+  file: "running-config/ejabberd.yml",
+  log_path: 'log/ejabberd.log'
+ 
+# Customize Mnesia directory:
+config :mnesia,
+  dir: 'mnesiadb/'
diff --git a/mix.exs b/mix.exs
index dee119971..99e00b0d8 100644
--- a/mix.exs
+++ b/mix.exs
@@ -15,7 +15,9 @@ defmodule Ejabberd.Mixfile do
 
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:kernel, :stdlib]]
+     applications: [:ssl],
+     included_applications: [:p1_logger,:p1_yaml,:p1_tls,:p1_xml,:p1_stringprep,:p1_zlib,:p1_cache_tab,:mnesia,:p1_utils,
+                             :p1_iconv,:esip,:p1_stun,:ehyperloglog,:p1_mysql,:p1_pgsql,:eredis]]
   end
   
   defp erlc_options do
@@ -39,7 +41,8 @@ defmodule Ejabberd.Mixfile do
         {:ehyperloglog, git: "https://github.com/vaxelfel/eHyperLogLog"},
         {:p1_mysql, git: "https://github.com/processone/mysql"},
         {:p1_pgsql, git: "https://github.com/processone/pgsql"},
-        {:eredis, git: "https://github.com/wooga/eredis"}
+        {:eredis, git: "https://github.com/wooga/eredis"},
+        {:exrm, "~> 0.19.2"}
      ]
   end
 end