diff --git a/docs/changelog.rst b/docs/changelog.rst
index 74bedde8b..15e1e6a6c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,12 @@ Changelog
 Starting with version 1.8.0, pybind11 releases use a `semantic versioning
 <http://semver.org>`_ policy.
 
+v2.0.2 (not yet released)
+-----------------------------------------------------
+
+* Use -x flag to strip shared libraries on OSX
+  `#595 <https://github.com/pybind/pybind11/pull/595>`_.
+
 v2.0.1 (Jan 4, 2017)
 -----------------------------------------------------
 
diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake
index fba76adee..4698566d6 100644
--- a/tools/pybind11Tools.cmake
+++ b/tools/pybind11Tools.cmake
@@ -140,7 +140,7 @@ function(pybind11_add_module target_name)
       if(CMAKE_STRIP)
         if(APPLE)
           add_custom_command(TARGET ${target_name} POST_BUILD
-                             COMMAND ${CMAKE_STRIP} -u -r $<TARGET_FILE:${target_name}>)
+                             COMMAND ${CMAKE_STRIP} -x $<TARGET_FILE:${target_name}>)
         else()
           add_custom_command(TARGET ${target_name} POST_BUILD
                              COMMAND ${CMAKE_STRIP} $<TARGET_FILE:${target_name}>)