diff --git a/Makefile.am b/Makefile.am
index c87fc75..cbc0081 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@
   include/ndn-cpp/security/security-common.hpp \
   include/ndn-cpp/security/key-chain.hpp \
   include/ndn-cpp/security/security-exception.hpp \
+  include/ndn-cpp/security/certificate/certificate.hpp \
   include/ndn-cpp/security/certificate/oid.hpp \
   include/ndn-cpp/security/certificate/public-key.hpp \
   include/ndn-cpp/security/encryption/encryption-manager.hpp \
diff --git a/Makefile.in b/Makefile.in
index 84d7443..11d0c52 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -582,6 +582,7 @@
   include/ndn-cpp/security/security-common.hpp \
   include/ndn-cpp/security/key-chain.hpp \
   include/ndn-cpp/security/security-exception.hpp \
+  include/ndn-cpp/security/certificate/certificate.hpp \
   include/ndn-cpp/security/certificate/oid.hpp \
   include/ndn-cpp/security/certificate/public-key.hpp \
   include/ndn-cpp/security/encryption/encryption-manager.hpp \
diff --git a/include/Makefile.am b/include/Makefile.am
index 409f202..242d4c0 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -33,6 +33,7 @@
   ndn-cpp/security/security-common.hpp \
   ndn-cpp/security/key-chain.hpp \
   ndn-cpp/security/security-exception.hpp \
+  ndn-cpp/security/certificate/certificate.hpp \
   ndn-cpp/security/certificate/oid.hpp \
   ndn-cpp/security/certificate/public-key.hpp \
   ndn-cpp/security/encryption/encryption-manager.hpp \
diff --git a/include/Makefile.in b/include/Makefile.in
index c4fc005..ca2484f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -350,6 +350,7 @@
   ndn-cpp/security/security-common.hpp \
   ndn-cpp/security/key-chain.hpp \
   ndn-cpp/security/security-exception.hpp \
+  ndn-cpp/security/certificate/certificate.hpp \
   ndn-cpp/security/certificate/oid.hpp \
   ndn-cpp/security/certificate/public-key.hpp \
   ndn-cpp/security/encryption/encryption-manager.hpp \
diff --git a/include/ndn-cpp/security/identity/identity-manager.hpp b/include/ndn-cpp/security/identity/identity-manager.hpp
index 08f0434..2dd9b6e 100644
--- a/include/ndn-cpp/security/identity/identity-manager.hpp
+++ b/include/ndn-cpp/security/identity/identity-manager.hpp
@@ -126,11 +126,7 @@
    * certificate the certificate to be added
    */
   void
-  addCertificateAsDefault(const Certificate& certificate)
-  {
-    identityStorage_->addCertificate(certificate);    
-    setDefaultCertificateForKey(certificate.getName());
-  }
+  addCertificateAsDefault(const Certificate& certificate);
 
   /**
    * Get a certificate with the specified name.
diff --git a/ndn-cpp/security/identity/identity-manager.cpp b/ndn-cpp/security/identity/identity-manager.cpp
index e07b483..93e61d4 100644
--- a/ndn-cpp/security/identity/identity-manager.cpp
+++ b/ndn-cpp/security/identity/identity-manager.cpp
@@ -81,6 +81,13 @@
   setDefaultCertificateForKey(certificate.getName());
 }
 
+void
+IdentityManager::addCertificateAsDefault(const Certificate& certificate)
+{
+  identityStorage_->addCertificate(certificate);    
+  setDefaultCertificateForKey(certificate.getName());
+}
+
 void 
 IdentityManager::signByCertificate(Data &data, const Name &certificateName, WireFormat& wireFormat)
 {