diff --git a/README.md b/README.md
index b739475..ca29a69 100644
--- a/README.md
+++ b/README.md
@@ -81,5 +81,5 @@
 ### License
 
 pybind11 is provided under a BSD-style license that can be found in the
-``LICENSE.txt`` file. By using, distributing, or contributing to this project,
+``LICENSE`` file. By using, distributing, or contributing to this project,
 you agree to the terms and conditions of this license.
diff --git a/docs/changelog.rst b/docs/changelog.rst
new file mode 100644
index 0000000..b992303
--- /dev/null
+++ b/docs/changelog.rst
@@ -0,0 +1,44 @@
+.. _changelog:
+
+Changelog
+#########
+
+1.2 (not yet released)
+--------------------------
+* Optional: efficient generation of function signatures at compile time using C++14
+* Switched to a simpler and more general way of dealing with function default arguments
+  Unused keyword arguments in function calls are now detected and cause errors as expected
+* New ``keep_alive`` call policy analogous to Boost.Python's ``with_custodian_and_ward``
+* Improved interface for RAII type wrappers in ``pytypes.h``
+* Use RAII type wrappers consistently within pybind11 itself. This
+  fixes various potential refcount leaks when exceptions occur
+* Added new ``bytes`` RAII type wrapper (maps to ``string`` in Python 2.7).
+* Made handle and related RAII classes const correct
+* Got rid of the ugly ``__pybind11__`` attributes on the Python side---they are
+  now stored in a C++ hash table that is not visible in Python
+* Fixed refcount leaks involving NumPy arrays and bound functions
+* Vastly improved handling of shared/smart pointers
+* Removed an unnecessary copy operation in ``pybind11::vectorize``
+* Fixed naming clashes when both pybind11 and NumPy headers are included
+* Added conversions for additional exception types
+* Documentation improvements (using multiple extension modules, smart pointers, other minor clarifications)
+* Fixed license text (was: ZLIB, should have been: 3-clause BSD)
+* Python 3.2 compatibility
+
+1.1 (December 7, 2015)
+--------------------------
+
+* Documentation improvements (GIL, wrapping functions, casting, fixed many typos)
+* Generalized conversion of integer types
+* Improved support for casting function objects
+* Improved support for ``std::shared_ptr<>`` conversions
+* Initial support for ``std::set<>`` conversions
+* Fixed type resolution issue for types defined in a separate plugin module
+* Cmake build system improvements
+* Factored out generic functionality to non-templated code (smaller code size)
+* Added a code size / compile time benchmark vs Boost.Python
+* Added an appveyor CI script
+
+1.0 (October 15, 2015)
+------------------------
+* Initial release
diff --git a/docs/index.rst b/docs/index.rst
index a05661e..b9afea5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -15,3 +15,4 @@
    cmake
    benchmark
    reference
+   changelog
diff --git a/include/pybind11/common.h b/include/pybind11/common.h
index 1f3f1cb..ff84661 100644
--- a/include/pybind11/common.h
+++ b/include/pybind11/common.h
@@ -30,6 +30,9 @@
 #  define PYBIND11_NOINLINE __attribute__ ((noinline))
 #endif
 
+#define PYBIND11_VERSION_MAJOR 1
+#define PYBIND11_VERSION_MINOR 3
+
 /// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
 #if defined(_MSC_VER)
 #  define HAVE_ROUND