diff -Nru ejabberd-2.1.11/debian/changelog ejabberd-2.1.11/debian/changelog
--- ejabberd-2.1.11/debian/changelog	2014-02-10 19:42:18.000000000 +0000
+++ ejabberd-2.1.11/debian/changelog	2014-04-28 10:09:19.000000000 +0000
@@ -1,3 +1,12 @@
+ejabberd (2.1.11-1ubuntu2.1) trusty; urgency=low
+
+  * Fix LDAP authentication (LP: #1241632)
+    - debian/patches/fix-erlang-r16b-compat.patch: backport upstream
+      fix for Erlang 16b compatibility. 
+    - upstream reference: https://support.process-one.net/browse/EJAB-1612
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 28 Apr 2014 12:09:12 +0200
+
 ejabberd (2.1.11-1ubuntu2) trusty; urgency=low
 
   * Use autotools-dev for arm64.
diff -Nru ejabberd-2.1.11/debian/patches/fix-erlang-r16b-compat.patch ejabberd-2.1.11/debian/patches/fix-erlang-r16b-compat.patch
--- ejabberd-2.1.11/debian/patches/fix-erlang-r16b-compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ ejabberd-2.1.11/debian/patches/fix-erlang-r16b-compat.patch	2014-01-03 13:57:24.000000000 +0000
@@ -0,0 +1,42 @@
+Description: Fix compatibility of LDAP support with Erlang R16
+ The asn1rt_ber_bin has been removed from Erlang/OTP R16A,
+ so this patch removes calls to these functions since they are
+ only used to do sanity checks which appear to be redundant.
+Author: Badlop <badlop@process-one.net>
+Bug: https://support.process-one.net/browse/EJAB-1612
+Forwarded: not-needed
+Applied-Upstream: 2.1.12, 2704378d43035474c5f3d8a656b81c7bc28b5ff9
+Last-Update: 2013-10-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/eldap/eldap.erl
++++ b/src/eldap/eldap.erl
+@@ -760,7 +760,6 @@
+ %%  {'EXIT', Reason} - Broke
+ %%-----------------------------------------------------------------------
+ recvd_packet(Pkt, S) ->
+-    check_tag(Pkt),
+     case asn1rt:decode('ELDAPv3', 'LDAPMessage', Pkt) of
+ 	{ok,Msg} ->
+ 	    Op = Msg#'LDAPMessage'.protocolOp,
+@@ -873,7 +872,6 @@
+ %%  {'EXIT', Reason} - Broken packet
+ %%-----------------------------------------------------------------------
+ recvd_wait_bind_response(Pkt, S) ->
+-    check_tag(Pkt),
+     case asn1rt:decode('ELDAPv3', 'LDAPMessage', Pkt) of
+ 	{ok,Msg} ->
+ 	    ?DEBUG("~p", [Msg]),
+@@ -906,12 +904,6 @@
+     end.
+ 
+ 
+-%%% Sanity check of received packet
+-check_tag(Data) ->
+-    {_Tag, Data1, _Rb} = asn1rt_ber_bin:decode_tag(Data),
+-    {{_Len,_Data2}, _Rb2} = asn1rt_ber_bin:decode_length(Data1),
+-    ok.
+-
+ close_and_retry(S, Timeout) ->
+     catch (S#eldap.sockmod):close(S#eldap.fd),
+     Queue = dict:fold(
diff -Nru ejabberd-2.1.11/debian/patches/series ejabberd-2.1.11/debian/patches/series
--- ejabberd-2.1.11/debian/patches/series	2013-11-11 19:33:27.000000000 +0000
+++ ejabberd-2.1.11/debian/patches/series	2014-04-28 11:18:54.000000000 +0000
@@ -9,3 +9,4 @@
 scram-optional-parameter-parsing-bugfix.patch
 disable-ssl2.patch
 disable-insecure-ssl-cyphers.patch
+fix-erlang-r16b-compat.patch