diff --git a/ChangeLog b/ChangeLog
index 184d31d07f..70adb476ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@ Bugfix
      Leisink).
    * Fix bug when parsing a ServerHello without extensions (found by David
      Sears).
+   * Fix bug in CMake lists that caused libmbedcrypto.a not to be installed
+     (found by Benoit Lecocq).
+   * Fix bug in Makefile that caused libmbedcrypto and libmbedx509 not to be
+     installed (found by Rawi666).
+
 
 = mbed TLS 2.0.0 released 2015-07-13
 
diff --git a/Makefile b/Makefile
index 0c489f891c..1c715a6a4f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,9 @@ install: all
 	cp -r include/mbedtls $(DESTDIR)/include
 	
 	mkdir -p $(DESTDIR)/lib
-	cp -RP library/libmbedtls.* $(DESTDIR)/lib
+	cp -RP library/libmbedtls.*    $(DESTDIR)/lib
+	cp -RP library/libmbedx509.*   $(DESTDIR)/lib
+	cp -RP library/libmbedcrypto.* $(DESTDIR)/lib
 	
 	mkdir -p $(DESTDIR)/bin
 	for p in programs/*/* ; do              \
@@ -40,6 +42,8 @@ install: all
 uninstall:
 	rm -rf $(DESTDIR)/include/mbedtls
 	rm -f $(DESTDIR)/lib/libmbedtls.*
+	rm -f $(DESTDIR)/lib/libmbedx509.*
+	rm -f $(DESTDIR)/lib/libmbedcrypto.*
 	
 	for p in programs/*/* ; do              \
 	    if [ -x $$p ] && [ ! -d $$p ] ;     \
diff --git a/README.rst b/README.rst
index 0d9b614b44..90cec14901 100644
--- a/README.rst
+++ b/README.rst
@@ -150,7 +150,8 @@ Process
    `start a discussion <https://tls.mbed.org/discussions>`_ around a feature
    idea or a bug.
 #. Fork the `mbed TLS repository on Github <https://github.com/ARMmbed/mbedtls>`_
-   to start making your changes.
+   to start making your changes. As a general rule, you should use the
+   "development" branch as a basis.
 #. Write a test which shows that the bug was fixed or that the feature works
    as expected.
 #. Send a pull request and bug us until it gets merged and published. We will
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index d2a29c5b39..af5f1735ce 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -131,7 +131,7 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
     set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls)
     target_link_libraries(${mbedtls_static_target} ${libs} ${mbedx509_static_target})
 
-    install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypt_static_target}
+    install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypto_static_target}
             DESTINATION ${LIB_INSTALL_DIR}
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif(USE_STATIC_MBEDTLS_LIBRARY)