diff --git a/libcelt/entdec.c b/libcelt/entdec.c
index 191d3ee825324e7c7540c9189fcca4fec9baabd4..5b8846bc25b320d75f82dfe65674e1d29e9b13d7 100644
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -111,21 +111,3 @@ ec_uint32 ec_dec_uint(ec_dec *_this,ec_uint32 _ft){
     return t;
   }
 }
-
-/* The probability of having a "one" is given in 1/256 */
-int ec_dec_bit_prob(ec_dec *_this,int _prob)
-{
-   int val;
-   int fl=0, fh=256-_prob;
-   val = ec_decode_bin(_this, 8);
-   if (val >= fh)
-   {
-      val = 1;
-      fl=fh;
-      fh=256;
-   } else {
-      val = 0;
-   }
-   ec_dec_update(_this,fl,fh,256);
-   return val;
-}
diff --git a/libcelt/entdec.h b/libcelt/entdec.h
index 008b6c8d7b79f74c42a9f9e377f8268b2735cce9..b2b4b5673ae96a14f83f66a3901b6a89a166a486 100644
--- a/libcelt/entdec.h
+++ b/libcelt/entdec.h
@@ -47,8 +47,7 @@ struct ec_dec{
    int             rem;
    /*The number of values in the current range.*/
    ec_uint32       rng;
-   /*The difference between the input value and the lowest value in the current
-      range.*/
+   /*The difference between the top of the current range and the input value.*/
    ec_uint32       dif;
    /*Normalization factor.*/
    ec_uint32       nrm;
diff --git a/libcelt/entenc.c b/libcelt/entenc.c
index 44353f5b151d95655e154c9f6909224a49b330e3..4594daa36f09407cc5911a27ebf592de8a30ea0a 100644
--- a/libcelt/entenc.c
+++ b/libcelt/entenc.c
@@ -100,15 +100,3 @@ void ec_enc_uint(ec_enc *_this,ec_uint32 _fl,ec_uint32 _ft){
     ec_encode(_this,_fl,_fl+1,_ft+1);
   }
 }
-
-/* The probability of having a "one" is given in 1/256 */
-void ec_enc_bit_prob(ec_enc *_this,int val,int _prob)
-{
-   int fl=0, fh=256-_prob;
-   if (val)
-   {
-      fl=fh;
-      fh=256;
-   }
-   ec_encode_bin(_this,fl,fh,8);
-}
diff --git a/libcelt/rangedec.c b/libcelt/rangedec.c
index a8d322b4de072f2feb397e248d4cb837449aef78..2526d4111d995b2037d1da3122e4d28fc451f5df 100644
--- a/libcelt/rangedec.c
+++ b/libcelt/rangedec.c
@@ -186,6 +186,22 @@ void ec_dec_update(ec_dec *_this,unsigned _fl,unsigned _fh,unsigned _ft){
   ec_dec_normalize(_this);
 }
 
+/*The probability of having a "one" is given in 1/256.*/
+int ec_dec_bit_prob(ec_dec *_this,int _prob){
+  ec_uint32 r;
+  ec_uint32 s;
+  ec_uint32 d;
+  int       val;
+  r=_this->rng;
+  d=_this->dif;
+  s=IMUL32(r>>8,_prob);
+  val=d<=s;
+  if(!val)_this->dif=d-s;
+  _this->rng=val?s:r-s;
+  ec_dec_normalize(_this);
+  return val;
+}
+
 long ec_dec_tell(ec_dec *_this,int _b){
   ec_uint32 r;
   int       l;
diff --git a/libcelt/rangeenc.c b/libcelt/rangeenc.c
index 0ba34974d3de97efa72b4397ecb955f5ce699d68..f7f171ba1ddd3a15a9c5c21a80c4185672e00c10 100644
--- a/libcelt/rangeenc.c
+++ b/libcelt/rangeenc.c
@@ -138,6 +138,20 @@ void ec_encode_bin(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned _bits){
    ec_enc_normalize(_this);
 }
 
+/*The probability of having a "one" is given in 1/256.*/
+void ec_enc_bit_prob(ec_enc *_this,int _val,int _prob){
+   ec_uint32 r;
+   ec_uint32 s;
+   ec_uint32 l;
+   r=_this->rng;
+   l=_this->low;
+   s=IMUL32(r>>8,_prob);
+   r-=s;
+   if(_val)_this->low=l+r;
+   _this->rng=_val?s:r;
+   ec_enc_normalize(_this);
+}
+
 void ec_encode_raw(ec_enc *_this,unsigned _fl,unsigned _fh,unsigned bits){
   _this->nb_end_bits += bits;
   while (bits >= _this->end_bits_left)