diff --git a/pulsar-client-cpp/CMakeLists.txt b/pulsar-client-cpp/CMakeLists.txt
index 580bf74c3bffc..3fe63e041b4d7 100644
--- a/pulsar-client-cpp/CMakeLists.txt
+++ b/pulsar-client-cpp/CMakeLists.txt
@@ -201,7 +201,7 @@ if (BUILD_PYTHON_WRAPPER)
         list(GET PYTHONLIBS_VERSION_NO_LIST 1 PYTHONLIBS_VERSION_MINOR)
         set(BOOST_PYTHON_NAME_POSTFIX ${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR})
         # For python3 the lib name is boost_python3
-        set(BOOST_PYTHON_NAME_LIST python36;python37;python38;python3;python3-mt;python-py${BOOST_PYTHON_NAME_POSTFIX};python${BOOST_PYTHON_NAME_POSTFIX}-mt;python${BOOST_PYTHON_NAME_POSTFIX})
+        set(BOOST_PYTHON_NAME_LIST python36;python37;python38;python39;python3;python3-mt;python-py${BOOST_PYTHON_NAME_POSTFIX};python${BOOST_PYTHON_NAME_POSTFIX}-mt;python${BOOST_PYTHON_NAME_POSTFIX})
     else ()
         # Regular boost_python
         set(BOOST_PYTHON_NAME_LIST python;python-mt;python-py27;python27-mt;python27)
diff --git a/pulsar-client-cpp/python/CMakeLists.txt b/pulsar-client-cpp/python/CMakeLists.txt
index 985aaf8cc4854..2607ab38c16b2 100644
--- a/pulsar-client-cpp/python/CMakeLists.txt
+++ b/pulsar-client-cpp/python/CMakeLists.txt
@@ -19,14 +19,20 @@
 
 INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}" "${PYTHON_INCLUDE_DIRS}")
 
-ADD_LIBRARY(_pulsar SHARED src/pulsar.cc src/producer.cc src/consumer.cc
-                            src/config.cc src/enums.cc src/client.cc
-                            src/message.cc src/authentication.cc
-                            src/reader.cc src/schema.cc)
+ADD_LIBRARY(_pulsar SHARED src/pulsar.cc
+                           src/producer.cc
+                           src/consumer.cc
+                           src/config.cc
+                           src/enums.cc
+                           src/client.cc
+                           src/message.cc
+                           src/authentication.cc
+                           src/reader.cc
+                           src/schema.cc)
+
 SET(CMAKE_SHARED_LIBRARY_PREFIX )
 SET(CMAKE_SHARED_LIBRARY_SUFFIX .so)
 
-
 if (NOT APPLE AND NOT MSVC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_PYTHON}")
 endif()
@@ -48,18 +54,27 @@ if (NOT DEFINED ${Boost_PYTHON38-MT_LIBRARY})
   set(Boost_PYTHON38-MT_LIBRARY ${Boost_PYTHON38_LIBRARY})
 endif()
 
+if (NOT DEFINED ${Boost_PYTHON39-MT_LIBRARY})
+  set(Boost_PYTHON39-MT_LIBRARY ${Boost_PYTHON39_LIBRARY})
+endif()
+
 # Try all possible boost-python variable namings
-set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}
-                        ${Boost_PYTHON27-MT_LIBRARY} ${Boost_PYTHON37-MT_LIBRARY}
-                        ${Boost_PYTHON34_LIBRARY} ${Boost_PYTHON35_LIBRARY}
-                        ${Boost_PYTHON36_LIBRARY} ${Boost_PYTHON38_LIBRARY}
+set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY}
+                        ${Boost_PYTHON3_LIBRARY}
+                        ${Boost_PYTHON27-MT_LIBRARY}
+                        ${Boost_PYTHON37-MT_LIBRARY}
+                        ${Boost_PYTHON34_LIBRARY}
+                        ${Boost_PYTHON35_LIBRARY}
+                        ${Boost_PYTHON36_LIBRARY}
+                        ${Boost_PYTHON38_LIBRARY}
                         ${Boost_PYTHON39_LIBRARY})
 
 if (APPLE)
     set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS}
-                         ${Boost_PYTHON27-MT_LIBRARY_RELEASE}
-                         ${Boost_PYTHON37-MT_LIBRARY_RELEASE}
-                         ${Boost_PYTHON38-MT_LIBRARY_RELEASE})
+                            ${Boost_PYTHON27-MT_LIBRARY_RELEASE}
+                            ${Boost_PYTHON37-MT_LIBRARY_RELEASE}
+                            ${Boost_PYTHON38-MT_LIBRARY_RELEASE}
+                            ${Boost_PYTHON39-MT_LIBRARY_RELEASE})
 endif()
 
 message(STATUS "Using Boost Python libs: ${PYTHON_WRAPPER_LIBS}")