diff --git a/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
index a150335..fd05500 100644
--- a/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
+++ b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
@@ -29,9 +29,11 @@
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.controls.CascadeFactory;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITFactory;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeFactory;
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesFactory;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
+import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -69,6 +71,9 @@
         
         ManageDsaITFactory manageDsaITFactory = new ManageDsaITFactory( this );
         controlFactories.put( ManageDsaIT.OID, manageDsaITFactory );
+        
+        EntryChangeFactory entryChangeFactory = new EntryChangeFactory( this );
+        controlFactories.put( EntryChange.OID, entryChangeFactory );
     }
     
 
diff --git a/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java
new file mode 100644
index 0000000..8f76abe
--- /dev/null
+++ b/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeFactory.java
@@ -0,0 +1,118 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.codec.search.controls.entryChange;
+
+
+import java.nio.ByteBuffer;
+
+import javax.naming.ldap.BasicControl;
+import javax.naming.ldap.Control;
+
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.IControlFactory;
+import org.apache.directory.shared.ldap.codec.ILdapCodecService;
+import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
+import org.apache.directory.shared.ldap.model.message.controls.EntryChangeImpl;
+
+
+/**
+ * A {@link IControlFactory} for {@link EntryChange} controls.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class EntryChangeFactory implements IControlFactory<EntryChange, EntryChangeDecorator>
+{
+    /** The LDAP codec service */
+    private ILdapCodecService codec = new DefaultLdapCodecService();
+
+    
+    /**
+     * Creates a new instance of EntryChangeFactory.
+     *
+     * @param codec The LDAP codec.
+     */
+    public EntryChangeFactory( ILdapCodecService codec )
+    {
+        this.codec = codec;
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    public String getOid()
+    {
+        return EntryChange.OID;
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public EntryChangeDecorator newCodecControl()
+    {
+        return new EntryChangeDecorator( codec );
+    }
+    
+
+    /**
+     * {@inheritDoc}
+     */
+    public EntryChangeDecorator decorate( EntryChange control )
+    {
+        return new EntryChangeDecorator( codec, control );
+    }
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    public EntryChange newControl()
+    {
+        return new EntryChangeImpl();
+    }
+    
+
+    /**
+     * {@inheritDoc}
+     */
+    public Control toJndiControl( EntryChange control ) throws EncoderException
+    {
+        EntryChangeDecorator decorator = decorate( control );
+        ByteBuffer bb = ByteBuffer.allocate( decorator.computeLength() );
+        decorator.encode( bb );
+        bb.flip();
+        return new BasicControl( EntryChange.OID, control.isCritical(), bb.array() );
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public EntryChange fromJndiControl( Control control ) throws DecoderException
+    {
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
+        decorator.setValue( control.getEncodedValue() );
+        return decorator;
+    }
+}