diff --git a/CMakeModules/Package.cmake b/CMakeModules/Package.cmake
index 9a7f0ff..2bcf361 100644
--- a/CMakeModules/Package.cmake
+++ b/CMakeModules/Package.cmake
@@ -17,12 +17,6 @@ set(CPACK_PACKAGE_CONTACT "axel@isouard.fr")
 
 if (WIN32)
   set(CPACK_GENERATOR "ZIP")
-
-  if (MSVC OR XCODE)
-    set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-$<$<CONFIG:Debug>:debug>)
-  elseif (CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-debug)
-  endif (MSVC OR XCODE)
 else (WIN32)
   set(CPACK_GENERATOR "TGZ")
 endif (WIN32)
@@ -75,12 +69,12 @@ if (UNIX AND NOT APPLE)
 
   set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${_PACKAGE_ARCH}")
   set(CPACK_SOURCE_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}-${_PACKAGE_ARCH}")
-
-  if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-debug)
-  endif (CMAKE_BUILD_TYPE MATCHES Debug)
 endif (UNIX AND NOT APPLE)
 
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+  set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-debug)
+endif (CMAKE_BUILD_TYPE MATCHES Debug)
+
 set(CPACK_INSTALL_CMAKE_PROJECTS
     "${CPACK_INSTALL_CMAKE_PROJECTS};${CMAKE_BINARY_DIR}/libwebrtc;libwebrtc;ALL;/")