diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1682ee..7d153d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,10 @@ project(${BASENAME})
 
 option(COVERAGE "Coverage" OFF)
 
-set(CMAKE_BUILD_TYPE DEBUG)
 set(CMAKE_C_FLAGS "-Wall")
 set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
+SET(CMAKE_STAGING_PREFIX "${CMAKE_SOURCE_DIR}/${CMAKE_SYSTEM_PROCESSOR}")
+SET(CMAKE_FIND_ROOT_PATH "${CMAKE_STAGING_PREFIX}")
 
 # set version based on git
 find_package(Git)
@@ -35,13 +36,14 @@ message(STATUS "CMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
 message(STATUS "CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
 message(STATUS "CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
 message(STATUS "CMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}")
+message(STATUS "CMAKE_STAGING_PREFIX=${CMAKE_STAGING_PREFIX}")
 
 # v4l2wrapper
 include_directories("v4l2wrapper/inc")
 find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a PATHS "." NO_CMAKE_FIND_ROOT_PATH)
 if (NOT V4L2WRAPPER_LIBRARY)
         message(STATUS "Installing v4l2wrapper")
-        EXEC_PROGRAM("git submodule init && git submodule update && make -C v4l2wrapper CC=${CMAKE_C_COMPILER} PREFIX=${CMAKE_FIND_ROOT_PATH} && cp v4l2wrapper/libv4l2wrapper.a . && make -C v4l2wrapper clean")
+        EXEC_PROGRAM("git submodule init && git submodule update && make -C v4l2wrapper CC=${CMAKE_C_COMPILER} PREFIX=${CMAKE_STAGING_PREFIX} && cp v4l2wrapper/libv4l2wrapper.a . && make -C v4l2wrapper clean")
 	find_library(V4L2WRAPPER_LIBRARY libv4l2wrapper.a PATHS "." NO_CMAKE_FIND_ROOT_PATH)
         message(STATUS "v4l2wrapper built in V4L2WRAPPER_LIBRARY=${V4L2WRAPPER_LIBRARY}")	
 endif (NOT V4L2WRAPPER_LIBRARY)
@@ -80,7 +82,7 @@ find_path(LIBLIVE555_INCLUDE_DIR liveMedia/liveMedia.hh)
 if (NOT LIBLIVE555_INCLUDE_DIR)
         message(STATUS "Installing live555")
         EXEC_PROGRAM("wget http://www.live555.com/liveMedia/public/live555-latest.tar.gz -O - | tar xzf -")
-        EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' CPPFLAGS=-DALLOW_RTSP_SERVER_PORT_REUSE=1 PREFIX=${CMAKE_FIND_ROOT_PATH} install")
+        EXEC_PROGRAM("cd live && ./genMakefiles linux-gdb && make CPLUSPLUS_COMPILER=${CMAKE_CXX_COMPILER} C_COMPILER=${CMAKE_C_COMPILER} LINK='${CMAKE_CXX_COMPILER} -o' CPPFLAGS=-DALLOW_RTSP_SERVER_PORT_REUSE=1 PREFIX=${CMAKE_STAGING_PREFIX} install")
 else (NOT LIBLIVE555_INCLUDE_DIR)
 	SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}liblivemedia-dev,)
 endif (NOT LIBLIVE555_INCLUDE_DIR)
@@ -113,18 +115,19 @@ if (SYSTEMD_FOUND)
 	message(STATUS "SystemD directory '${SYSTEMD_SERVICES_INSTALL_DIR}'")
 	
 	configure_file(v4l2rtspserver.service.in ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service @ONLY)
-	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR} COMPONENT data)
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/v4l2rtspserver.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR} COMPONENT data EXCLUDE_FROM_ALL)
 endif (SYSTEMD_FOUND)
 
 # package
-install (TARGETS ${PROJECT_NAME} DESTINATION bin)
+install (TARGETS ${PROJECT_NAME} DESTINATION bin COMPONENT bin)
 
-SET(CPACK_GENERATOR "DEB")
+SET(CPACK_GENERATOR "DEB;TGZ")
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet") 
 SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr") 
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
 STRING(REGEX REPLACE ",$" "" CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}")
-find_package(Git)
+set(CPACK_DEB_COMPONENT_INSTALL "ON")
+set(CPACK_ARCHIVE_COMPONENT_INSTALL "OFF")
 if(VERSION)
     SET(CPACK_PACKAGE_VERSION "${VERSION}")
 endif()
diff --git a/mips.toolchain b/mips.toolchain
index 97bf3b1..2ca28ec 100644
--- a/mips.toolchain
+++ b/mips.toolchain
@@ -4,8 +4,6 @@ SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 SET(CMAKE_C_COMPILER mips-linux-gnu-gcc)
 SET(CMAKE_CXX_COMPILER mips-linux-gnu-g++)
 
-SET(CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/${CMAKE_SYSTEM_PROCESSOR}")
-
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/nanopi.toolchain b/nanopi.toolchain
index 7f09c62..0e18593 100644
--- a/nanopi.toolchain
+++ b/nanopi.toolchain
@@ -4,8 +4,6 @@ SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 SET(CMAKE_C_COMPILER arm-linux-gcc)
 SET(CMAKE_CXX_COMPILER arm-linux-g++)
 
-SET(CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/${CMAKE_SYSTEM_PROCESSOR}")
-
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/raspberry.toolchain b/raspberry.toolchain
index 25896fd..376c439 100644
--- a/raspberry.toolchain
+++ b/raspberry.toolchain
@@ -1,11 +1,9 @@
 SET(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_SYSTEM_PROCESSOR armhf)
-set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+SET(CMAKE_SYSTEM_PROCESSOR armv7l)
+SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
 SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 
-SET(CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/${CMAKE_SYSTEM_PROCESSOR}")
-
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)