diff --git a/docs/conf.py b/docs/conf.py
index 60baa9a..4d2b58c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -14,6 +14,7 @@
 
 import sys
 import os
+import re
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -45,18 +46,9 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'NDN C++ library with eXperimental eXtensions'
+project = u'ndn-cxx: NDN C++ library with eXperimental eXtensions'
 copyright = u'2014, Named Data Networking Project'
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '0.1.0'
-# The full version, including alpha/beta/rc tags.
-release = '0.1.0'
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
diff --git a/docs/doxygen.conf b/docs/doxygen.conf.in
similarity index 99%
rename from docs/doxygen.conf
rename to docs/doxygen.conf.in
index 9998dd2..a25b2ec 100644
--- a/docs/doxygen.conf
+++ b/docs/doxygen.conf.in
@@ -32,13 +32,13 @@
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "NDN C++ library with eXperimental eXtensions"
+PROJECT_NAME           = "ndn-cxx: NDN C++ library with eXperimental eXtensions"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.1.0
+PROJECT_NUMBER         = @VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/docs/manpages.rst b/docs/manpages.rst
index af5501d..6907bee 100644
--- a/docs/manpages.rst
+++ b/docs/manpages.rst
@@ -15,6 +15,7 @@
     ndnsec-export       <manpages/ndnsec-export>
     ndnsec-import       <manpages/ndnsec-import>
     ndnsec-unlock-tpm   <manpages/ndnsec-unlock-tpm>
+    ndnsec-set-acl      <manpages/ndnsec-set-acl>
     manpages/tlvdump
     :maxdepth: 1
 
diff --git a/docs/manpages/ndnsec-op-tool.rst b/docs/manpages/ndnsec-op-tool.rst
deleted file mode 100644
index e69de29..0000000
--- a/docs/manpages/ndnsec-op-tool.rst
+++ /dev/null
diff --git a/docs/manpages/ndnsec-sig-verify.rst b/docs/manpages/ndnsec-sig-verify.rst
deleted file mode 100644
index e69de29..0000000
--- a/docs/manpages/ndnsec-sig-verify.rst
+++ /dev/null