diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8b7ea06..8ae97e00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,8 +151,9 @@ if (EXISTS .gitignore)
   set(CPACK_PACKAGE_VERSION_MAJOR 0)
   set(CPACK_PACKAGE_VERSION_MINOR 8)
   set(CPACK_PACKAGE_VERSION_PATCH 0)
-  set(CPACK_SOURCE_PACKAGE_FILE_NAME
-    cppformat-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
+  set(CPPFORMAT_VERSION
+    ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME cppformat-${CPPFORMAT_VERSION})
   set(CPACK_RESOURCE_FILE_README ${FORMAT_SOURCE_DIR}/README.rst)
   include(CPack)
 endif ()
diff --git a/doc/conf.py.in b/doc/conf.py.in
index 4e504650..20e4706c 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -46,15 +46,15 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'format'
-copyright = u'1990-2012, Python Software Foundation'
+project = u'C++ Format'
+copyright = u'2012-2014, Victor Zverovich'
 
 # 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 = '@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@'
+version = '@CPPFORMAT_VERSION@'
 # The full version, including alpha/beta/rc tags.
 release = version