diff --git a/CMakeModules/Package.cmake b/CMakeModules/Package.cmake
index 889a0e3..949e6e4 100644
--- a/CMakeModules/Package.cmake
+++ b/CMakeModules/Package.cmake
@@ -1,21 +1,79 @@
 #
 # Create package
+set(CPACK_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}-${TARGET_OS}-${TARGET_CPU}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "WebRTC in a single static library")
+set(CPACK_PACKAGE_DESCRIPTION "Google's native WebRTC implementation shipped into a single library")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+
 set(CPACK_PACKAGE_NAME "LibWebRTC")
+set(CPACK_PACKAGE_VERSION "${LIBWEBRTC_VERSION}")
 set(CPACK_PACKAGE_VERSION_MAJOR "${LIBWEBRTC_MAJOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_MINOR "${LIBWEBRTC_MINOR_VERSION}")
 set(CPACK_PACKAGE_VERSION_PATCH "${LIBWEBRTC_PATCH_VERSION}")
 
-set(CPACK_INSTALL_CMAKE_PROJECTS
-    "${CPACK_INSTALL_CMAKE_PROJECTS};${CMAKE_BINARY_DIR}/libwebrtc;libwebrtc;ALL;/")
+set(CPACK_PACKAGE_VENDOR "Axel Isouard")
+set(CPACK_PACKAGE_CONTACT "axel@isouard.fr")
 
 if (WIN32)
-  set(CPACK_GENERATOR "7Z")
+  set(CPACK_GENERATOR "ZIP")
 else (WIN32)
   set(CPACK_GENERATOR "TGZ")
 endif (WIN32)
 
+if (UNIX AND NOT APPLE)
+  if (TARGET_CPU STREQUAL "x86")
+    set(_RPM_ARCH "i686")
+    set(_DEB_ARCH "i386")
+  elseif (TARGET_CPU STREQUAL "x64")
+    set(_RPM_ARCH "x86_64")
+    set(_DEB_ARCH "amd64")
+  elseif (TARGET_CPU STREQUAL "arm")
+    set(_RPM_ARCH "armhf")
+    set(_DEB_ARCH "armhf")
+  elseif (TARGET_CPU STREQUAL "arm64")
+    set(_RPM_ARCH "aarch64")
+    set(_DEB_ARCH "arm64")
+  else ()
+    set(_RPM_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+    set(_DEB_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+  endif ()
+
+  set(CPACK_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}")
+  if (CPACK_GENERATOR STREQUAL "RPM")
+    set(_PACKAGE_ARCH ${_RPM_ARCH})
+  elseif (CPACK_GENERATOR STREQUAL "DEB")
+    set(_PACKAGE_ARCH ${_DEB_ARCH})
+  else ()
+    set(_PACKAGE_ARCH ${TARGET_CPU})
+    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${TARGET_OS}")
+  endif ()
+
+  if (BUILD_DEB_PACKAGE)
+    set(CPACK_DEB_COMPONENT_INSTALL FALSE)
+    set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+    set(CPACK_DEBIAN_PACKAGE_SECTION "libs")
+    set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://axel.isouard.fr/libwebrtc")
+    set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE)
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
+  endif (BUILD_DEB_PACKAGE)
+
+  if (BUILD_RPM_PACKAGE)
+    set(CPACK_RPM_COMPONENT_INSTALL FALSE)
+    set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+    set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
+    set(CPACK_RPM_PACKAGE_URL "https://axel.isouard.fr/libwebrtc")
+    set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+  endif (BUILD_RPM_PACKAGE)
+
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${_PACKAGE_ARCH}")
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}-${_PACKAGE_ARCH}")
+endif (UNIX AND NOT APPLE)
+
+set(CPACK_INSTALL_CMAKE_PROJECTS
+    "${CPACK_INSTALL_CMAKE_PROJECTS};${CMAKE_BINARY_DIR}/libwebrtc;libwebrtc;ALL;/")
+
 set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-set(CPACK_PACKAGE_FILE_NAME "libwebrtc-${LIBWEBRTC_VERSION}-${TARGET_OS}-${TARGET_CPU}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "libwebrtc")
 
 include(CPack)