diff --git a/mix.exs b/mix.exs
index e8e34c47e..b002e36b7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -3,8 +3,8 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "15.11.0",
-     elixir: "~> 1.0",
+     version: "16.01.0",
+     elixir: "~> 1.1",
      elixirc_paths: ["lib"],
      compile_path: ".",
      compilers: [:asn1] ++ Mix.compilers,
@@ -16,11 +16,12 @@ defmodule Ejabberd.Mixfile do
 
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:ssl],
-     included_applications: [:p1_logger, :p1_yaml, :p1_tls, :p1_xml,
-                             :p1_stringprep, :p1_zlib, :cache_tab,
-                             :mnesia, :p1_utils, :p1_iconv, :esip, :p1_stun,
-                             :p1_mysql, :p1_pgsql, :eredis, :oauth2, :xmlrpc]]
+     applications: [:ssl, :mnesia],
+     included_applications: [:lager, :p1_utils, :cache_tab,
+                             :p1_tls, :p1_stringprep, :p1_xml,
+                             :p1_stun, :p1_yaml, :p1_zlib, :p1_iconv,
+                             :esip, :jiffy, :oauth2, :xmlrpc, :eredis,
+                             :p1_mysql, :p1_pgsql, :sqlite3]]
   end
 
   defp erlc_options do
@@ -30,23 +31,25 @@ defmodule Ejabberd.Mixfile do
   end
 
   defp deps do
-    [{:p1_xml, git: "https://github.com/processone/xml"},
-     {:p1_logger, git: "https://github.com/processone/p1_logger"},
-     {:p1_yaml, git: "https://github.com/processone/p1_yaml"},
-     {:p1_tls, git: "https://github.com/processone/tls"},
-     {:p1_stringprep, git: "https://github.com/processone/stringprep"},
-     {:p1_zlib, git: "https://github.com/processone/zlib"},
+    [{:lager, git: "https://github.com/basho/lager", tag: "3.0.2"},
+     {:p1_utils, git: "https://github.com/processone/p1_utils", tag: "1.0.2"},
      {:cache_tab, git: "https://github.com/processone/cache_tab", tag: "1.0.1"},
-     {:p1_utils, git: "https://github.com/processone/p1_utils"},
-     {:p1_iconv, git: "https://github.com/processone/eiconv"},
-     {:esip, git: "https://github.com/processone/p1_sip"},
-     {:p1_stun, git: "https://github.com/processone/stun"},
-     {:p1_mysql, git: "https://github.com/processone/mysql"},
-     {:p1_pgsql, git: "https://github.com/processone/pgsql"},
-     {:eredis, git: "https://github.com/wooga/eredis"},
-     {:oauth2, git: "https://github.com/prefiks/oauth2.git"},
-     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git"},
-     {:exrm, "~> 0.19.2"}]
+     {:p1_tls, git: "https://github.com/processone/tls", tag: "1.0.0"},
+     {:p1_stringprep, git: "https://github.com/processone/stringprep", tag: "1.0.0"},
+     {:p1_xml, git: "https://github.com/processone/xml", tag: "1.1.1"},
+     {:p1_stun, git: "https://github.com/processone/stun", tag: "0.9.0"},
+     {:esip, git: "https://github.com/processone/p1_sip", tag: "1.0.0"},
+     {:p1_yaml, git: "https://github.com/processone/p1_yaml", tag: "1.0.0"},
+     {:jiffy, git: "https://github.com/davisp/jiffy", tag: "0.14.5"},
+     {:oauth2, git: "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"},
+     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git", tag: "1.15"},
+     {:p1_mysql, git: "https://github.com/processone/mysql", tag: "1.0.0"},
+     {:p1_pgsql, git: "https://github.com/processone/pgsql", tag: "1.0.0"},
+     {:sqlite3, git: "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"},
+     {:p1_zlib, git: "https://github.com/processone/zlib", tag: "1.0.0"},
+     {:p1_iconv, git: "https://github.com/processone/eiconv", tag: "0.9.0"},
+     {:eredis, git: "https://github.com/wooga/eredis", tag: "v1.0.8"},
+     {:exrm, "0.19.9"}]
   end
 
   defp package do
diff --git a/mix.lock b/mix.lock
index 001e00624..5f4955115 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,24 +1,8 @@
-%{"bbmustache": {:hex, :bbmustache, "1.0.3"},
-  "conform": {:hex, :conform, "0.17.0"},
-  "eredis": {:git, "https://github.com/wooga/eredis", "bf12ecb30253c84a2331f4f0d93fd68856fcb9f4", []},
-  "erlware_commons": {:hex, :erlware_commons, "0.15.0"},
-  "esip": {:git, "https://github.com/processone/p1_sip", "d662d3fe7f6288b444ea321d854de0bd6d40e022", []},
-  "exrm": {:hex, :exrm, "0.19.9"},
+%{"bbmustache": {:hex, :bbmustache, "1.0.4"},
+  "erlware_commons": {:hex, :erlware_commons, "0.18.0"},
   "getopt": {:hex, :getopt, "0.8.2"},
-  "neotoma": {:hex, :neotoma, "1.7.3"},
-  "oauth2": {:git, "https://github.com/prefiks/oauth2.git", "e6da9912e5d8f658e7e868f41a102d085bdbef59", []},
-  "p1_cache_tab": {:git, "https://github.com/processone/cache_tab", "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230", []},
-  "p1_iconv": {:git, "https://github.com/processone/eiconv", "8b7542b1aaf0a851f335e464956956985af6d9a2", []},
-  "p1_logger": {:git, "https://github.com/processone/p1_logger", "3e19507fd5606a73694917158767ecb3f5704e3f", []},
-  "p1_mysql": {:git, "https://github.com/processone/mysql", "dfa87da95f8fdb92e270741c2a53f796b682f918", []},
-  "p1_pgsql": {:git, "https://github.com/processone/pgsql", "e72c03c60bfcb56bbb5d259342021d9cb3581dac", []},
-  "p1_stringprep": {:git, "https://github.com/processone/stringprep", "3c640237a3a7831dc39de6a6d329d3a9af25c579", []},
-  "p1_stun": {:git, "https://github.com/processone/stun", "061bdae484268cbf0457ad4797e74b8516df3ad1", []},
-  "p1_tls": {:git, "https://github.com/processone/tls", "e56321afd974e9da33da913cd31beebc8e73e75f", []},
-  "p1_utils": {:git, "https://github.com/processone/p1_utils", "7aa022f995e3be006224a25405cd431483e7d026", []},
-  "p1_xml": {:git, "https://github.com/processone/xml", "403066ea5e0b2cd89e65c3ed1a329789c02c3588", []},
-  "p1_yaml": {:git, "https://github.com/processone/p1_yaml", "79f756ba73a235c4d3836ec07b5f7f2b55f49638", []},
-  "p1_zlib": {:git, "https://github.com/processone/zlib", "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602", []},
-  "providers": {:hex, :providers, "1.4.1"},
-  "relx": {:hex, :relx, "3.5.0"},
-  "xmlrpc": {:git, "https://github.com/rds13/xmlrpc.git", "42e6e96a0fe7106830274feed915125feb1056f3", []}}
+  "providers": {:hex, :providers, "1.6.0"},
+  "cf": {:hex, :cf, "0.2.1"},
+  "relx": {:hex, :relx, "3.11.0"},
+  "conform": {:hex, :conform, "0.17.0"},
+  "neotoma": {:hex, :neotoma, "1.7.3"}}