diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab5b981..0c6425b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,9 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 if(NOT DEFINED BUILD_NUMBER)
 	set(BUILD_NUMBER 9999)
 endif()
+if("x${BUILD_NUMBER}" STREQUAL "x")
+	set(BUILD_NUMBER 0)
+endif()
 set(_COMPANY  SHS)
 set(_DOMAIN   org.SHS)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
diff --git a/pip b/pip
index e85275c..b07fe9f 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit e85275c58732532866ad40541b75cb32aed37108
+Subproject commit b07fe9f892aa5fb0a7a5967e223928a3aa846f67
diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt
index 13da4cb..913edec 100644
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -25,8 +25,8 @@ set_version(${PROJECT_NAME}
 	MAJOR    ${_QCD_MAJOR}
 	MINOR    ${_QCD_MINOR}
 	REVISION ${_QCD_REVISION}
-	BUILD    ${BUILD_NUMBER}
-	SUFFIX   ${_QCD_SUFFIX})
+	BUILD    "${BUILD_NUMBER}"
+	SUFFIX   "${_QCD_SUFFIX}")
 
 find_package(QAD REQUIRED)
 list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt
index 04ed505..464b304 100644
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -1,10 +1,5 @@
 project(cd_pult)
-set_version(${PROJECT_NAME}
-	MAJOR    ${_QCD_MAJOR}
-	MINOR    ${_QCD_MINOR}
-	REVISION ${_QCD_REVISION}
-	BUILD    ${BUILD_NUMBER}
-	SUFFIX   ${_QCD_SUFFIX})
+import_version(${PROJECT_NAME} qcd_utils)
 find_qt(${QtVersions} Core Gui OpenGL)
 set_deploy_property(${PROJECT_NAME}
 		LABEL 		${PROJECT_NAME}