diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaec1c29..de404754 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 project(PIP)
 set(PIP_MAJOR    5)
 set(PIP_MINOR    6)
-set(PIP_REVISION 0)
+set(PIP_REVISION 1)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
@@ -73,6 +73,7 @@ option(COVERAGE "Build project with coverage info" OFF)
 option(PIP_FFTW_F "Support fftw module for float" ON)
 option(PIP_FFTW_L "Support fftw module for long double" ON)
 option(PIP_FFTW_Q "Support fftw module for quad double" OFF)
+option(PIP_MANUAL_TEST "Build dev test (main.cpp)" OFF)
 set(PIP_UTILS 1)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 11)
@@ -593,12 +594,14 @@ if (NOT CROSSTOOLS)
 			#target_link_libraries(pip_plugin pip)
 
 			if (NOT DEFINED ANDROID_PLATFORM)
-				if(microhttpd_FOUND AND curl_FOUND)
-					add_executable(pip_test "main.cpp")
-					target_link_libraries(pip_test pip pip_io_utils pip_client_server pip_http_server pip_http_client)
-					if(sodium_FOUND)
-						add_executable(pip_cloud_test "main_picloud_test.cpp")
-						target_link_libraries(pip_cloud_test pip_cloud)
+				if (PIP_MANUAL_TEST)
+					if(microhttpd_FOUND AND curl_FOUND)
+						add_executable(pip_test "main.cpp")
+						target_link_libraries(pip_test pip pip_io_utils pip_client_server pip_http_server pip_http_client)
+						if(sodium_FOUND)
+							add_executable(pip_cloud_test "main_picloud_test.cpp")
+							target_link_libraries(pip_cloud_test pip_cloud)
+						endif()
 					endif()
 				endif()
 			endif()
diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp
index 899c9a46..69b15942 100644
--- a/utils/deploy_tool/main.cpp
+++ b/utils/deploy_tool/main.cpp
@@ -467,11 +467,20 @@ bool procDpkg(const PIString & l) {
 	if (!vs.isEmpty()) {
 		PIStringList lines = vs.split('\n').reverse();
 		for (auto l: lines) {
-			auto sl = l;
-			l       = l.left(l.find(":"));
-			if (!l.isEmpty() && !l.endsWith("-cross") && !l.contains(' ')) all_deps << l;
-			// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
-			return true;
+			l = l.left(l.find(":"));
+			if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross") && !l.endsWith("-dev")) {
+				// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
+				all_deps << l;
+				return true;
+			}
+		}
+		for (auto l: lines) {
+			l = l.left(l.find(":"));
+			if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross")) {
+				// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
+				all_deps << l;
+				return true;
+			}
 		}
 	}
 	// piCout << "No dep on" << l;