diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28b9d155..27303c0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,7 @@ if(MSVC)
     add_definitions("-D_CRT_SECURE_NO_WARNINGS=1")
     add_definitions("-D_SCL_SECURE_NO_WARNINGS=1")
     add_definitions("-DNOGDI=1")
+    add_definitions("-DNOMINMAX=1")
 else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
 endif()
@@ -48,6 +49,10 @@ else()
     add_definitions("-DCPPKAFKA_STATIC=1")
 endif()
 
+if (CPPKAFKA_RDKAFKA_STATIC_LIB)
+    add_definitions("-DLIBRDKAFKA_STATICLIB")
+endif()
+
 # Look for Boost (just need boost.optional headers here)
 find_package(Boost REQUIRED ${FIND_PACKAGE_QUIET})
 find_package(RdKafka REQUIRED ${FIND_PACKAGE_QUIET})