diff --git a/Makefile.am b/Makefile.am
index a6818df..4533a01 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,7 @@
   src/encoding/binary-xml-decoder.hpp \
   src/encoding/binary-xml-encoder.hpp \
   src/encoding/binary-xml-structure-decoder.hpp \
+  src/encoding/binary-xml-wire-format.cpp \
   src/encoding/block.cpp \
   src/encoding/cryptopp/asn_ext.cpp \
   src/encoding/cryptopp/asn_ext.hpp \
@@ -119,11 +120,6 @@
   src/util/string-helper.hpp \
   src/util/time.hpp
 
-# Temporary disabled:
-#   data/interest/forwardingEntry set/get methods need to be 
-#   embedded in BinaryXmlWireFormat class
-# src/encoding/binary-xml-wire-format.cpp
-
 libndn_cpp_la_LIBADD  = @OPENSSL_LIBS@ @OSX_SECURITY_LIBS@
 libndn_cpp_la_LDFLAGS = @OPENSSL_LDFLAGS@  @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
 libndn_cpp_la_CFLAGS  = @OPENSSL_INCLUDES@ @SQLITE3_CFLAGS@  @BOOST_CPPFLAGS@