diff --git a/build.gradle b/build.gradle
index 2a94efa..7ef831f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@
 }
 
 dependencies {
-  compile 'net.named-data:jndn:0.9'
+  compile 'net.named-data:jndn:0.10'
   testCompile 'junit:junit:4.12'
 }
 
diff --git a/pom.xml b/pom.xml
index 19cd6b2..4c5bc97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>net.named-data</groupId>
       <artifactId>jndn</artifactId>
-      <version>0.9</version>
+      <version>0.10</version>
     </dependency>
     <!-- Test dependencies -->
     <dependency>
diff --git a/src/main/java/com/intel/jndn/mock/MockFace.java b/src/main/java/com/intel/jndn/mock/MockFace.java
index d0ec460..89a9c97 100644
--- a/src/main/java/com/intel/jndn/mock/MockFace.java
+++ b/src/main/java/com/intel/jndn/mock/MockFace.java
@@ -18,11 +18,9 @@
 import net.named_data.jndn.encoding.TlvWireFormat;
 import net.named_data.jndn.encoding.tlv.Tlv;
 import net.named_data.jndn.encoding.tlv.TlvDecoder;
-import net.named_data.jndn.encoding.tlv.TlvEncoder;
 import net.named_data.jndn.security.KeyChain;
 import net.named_data.jndn.security.SecurityException;
 import net.named_data.jndn.transport.Transport;
-import net.named_data.jndn.util.Blob;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -194,18 +192,14 @@
         params.setCost(0);
       }
 
-      // TODO: replace with jNDN ControlResponse encoding when available
-      // http://redmine.named-data.net/issues/3455
-      TlvEncoder encoder = new TlvEncoder(256);
-      int saveLength = encoder.getLength();
-      encoder.writeBuffer(params.wireEncode().buf());
-      encoder.writeBlobTlv(Tlv.NfdCommand_StatusText, new Blob("OK").buf());
-      encoder.writeNonNegativeIntegerTlv(Tlv.NfdCommand_StatusCode, 200);
-      encoder.writeTypeAndLength(Tlv.NfdCommand_ControlResponse, encoder.getLength() - saveLength);
+      ControlResponse response = new ControlResponse();
+      response.setStatusCode(200);
+      response.setStatusText("OK");
+      response.setBodyAsControlParameters(params);
 
       Data data = new Data();
       data.setName(interest.getName());
-      data.setContent(new Blob(encoder.getOutput(), false));
+      data.setContent(response.wireEncode());
       keyChain.sign(data);
 
       receive(data);