diff --git a/Changelog b/Changelog
index 6ab3e84..e863a08 100644
--- a/Changelog
+++ b/Changelog
@@ -130,6 +130,7 @@ easier to use. The changes are:
 - Microsoft Windows ICO demuxer
 - life source
 - PCM format support in OMA demuxer
+- CLJR encoder
 
 
 version 0.8:
diff --git a/doc/general.texi b/doc/general.texi
index 1b720f5..e81f939 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -401,7 +401,7 @@ following image formats are supported:
     @tab Codec used in Delphine Software International games.
 @item Discworld II BMV Video @tab     @tab  X
 @item Cinepak                @tab     @tab  X
-@item Cirrus Logic AccuPak   @tab     @tab  X
+@item Cirrus Logic AccuPak   @tab  X  @tab  X
     @tab fourcc: CLJR
 @item Creative YUV (CYUV)    @tab     @tab  X
 @item DFA                    @tab     @tab  X
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 690a327..e1e64e7 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -89,7 +89,7 @@ void avcodec_register_all(void)
     REGISTER_DECODER (CAVS, cavs);
     REGISTER_DECODER (CDGRAPHICS, cdgraphics);
     REGISTER_DECODER (CINEPAK, cinepak);
-    REGISTER_DECODER (CLJR, cljr);
+    REGISTER_ENCDEC  (CLJR, cljr);
     REGISTER_DECODER (CSCD, cscd);
     REGISTER_DECODER (CYUV, cyuv);
     REGISTER_DECODER (DFA, dfa);
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 6e352b8..05cad20 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -25,12 +25,8 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "get_bits.h"
-
-/* Disable the encoder. */
-#undef CONFIG_CLJR_ENCODER
-#define CONFIG_CLJR_ENCODER 0
+#include "put_bits.h"
 
 typedef struct CLJRContext{
     AVCodecContext *avctx;
@@ -94,24 +90,35 @@ static int decode_frame(AVCodecContext *avctx,
 
 #if CONFIG_CLJR_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
-    CLJRContext * const a = avctx->priv_data;
-    AVFrame *pict = data;
-    AVFrame * const p= (AVFrame*)&a->picture;
-    int size;
+    PutBitContext pb;
+    AVFrame *p = data;
+    int x, y;
 
-    *p = *pict;
     p->pict_type= AV_PICTURE_TYPE_I;
     p->key_frame= 1;
 
-    emms_c();
+    init_put_bits(&pb, buf, buf_size / 8);
 
-    avpriv_align_put_bits(&a->pb);
-    while(get_bit_count(&a->pb)&31)
-        put_bits(&a->pb, 8, 0);
+    for (y = 0; y < avctx->height; y++) {
+        uint8_t *luma = &p->data[0][y * p->linesize[0]];
+        uint8_t *cb = &p->data[1][y * p->linesize[1]];
+        uint8_t *cr = &p->data[2][y * p->linesize[2]];
+        for (x = 0; x < avctx->width; x+=4) {
+            put_bits(&pb, 5, luma[3] >> 3);
+            put_bits(&pb, 5, luma[2] >> 3);
+            put_bits(&pb, 5, luma[1] >> 3);
+            put_bits(&pb, 5, luma[0] >> 3);
+            luma+=4;
+            put_bits(&pb, 6, *(cb++) >> 2);
+            put_bits(&pb, 6, *(cr++) >> 2);
+        }
+    }
 
-    size= get_bit_count(&a->pb)/32;
+    flush_put_bits(&pb);
+
+    emms_c();
 
-    return size*4;
+    return put_bits_count(&pb) / 8;
 }
 #endif
 
@@ -160,6 +167,9 @@ AVCodec ff_cljr_encoder = {
     .priv_data_size = sizeof(CLJRContext),
     .init           = encode_init,
     .encode         = encode_frame,
+    .pix_fmts = (const enum PixelFormat[]){
+        PIX_FMT_YUV411P,
+        PIX_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #endif
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 6c8d8ab..8dad3c8 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -266,7 +266,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_TARGA,        MKTAG('t', 'g', 'a', ' ') },
     { CODEC_ID_PNG,          MKTAG('M', 'P', 'N', 'G') },
     { CODEC_ID_PNG,          MKTAG('P', 'N', 'G', '1') },
-    { CODEC_ID_CLJR,         MKTAG('c', 'l', 'j', 'r') },
+    { CODEC_ID_CLJR,         MKTAG('C', 'L', 'J', 'R') },
     { CODEC_ID_DIRAC,        MKTAG('d', 'r', 'a', 'c') },
     { CODEC_ID_RPZA,         MKTAG('a', 'z', 'p', 'r') },
     { CODEC_ID_RPZA,         MKTAG('R', 'P', 'Z', 'A') },