diff --git a/Jenkinsfile b/Jenkinsfile
index 4cb9a4a..44cdf84 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,8 +46,7 @@ pipeline {
                 sh '''
                     mkdir -p build
                     cd build
-                    export OGBROWSER_VERSION_PATCH="${BUILD_NUMBER}"
-                    cmake .. -G Ninja
+                    cmake .. -DCPACK_PACKAGE_VERSION_PATCH=${BUILD_NUMBER} -G Ninja
                     ninja
                 '''
             }
diff --git a/qtermwidget/CMakeLists.txt b/qtermwidget/CMakeLists.txt
index 09a1e35..b664834 100644
--- a/qtermwidget/CMakeLists.txt
+++ b/qtermwidget/CMakeLists.txt
@@ -53,7 +53,10 @@ else()
     find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
 endif()
 
-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} QUIET)
+if (NOT lxqt-build-tools_FOUND)
+    find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+endif()
 
 if(USE_UTF8PROC)
     find_package(Utf8Proc REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e53af0e..2dc6ac0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,23 +10,18 @@ set(CMAKE_AUTORCC ON)
 
 
 
-if (DEFINED $ENV{OGBROWSER_VERSION_MAJOR})
-    set(CPACK_PACKAGE_VERSION_MAJOR "$ENV{OGBROWSER_VERSION_MAJOR}")
-else()
+if (NOT DEFINED CPACK_PACKAGE_VERSION_MAJOR)
     set(CPACK_PACKAGE_VERSION_MAJOR "2")
 endif()
 
 
-if (DEFINED $ENV{OGBROWSER_VERSION_MINOR})
-    set(CPACK_PACKAGE_VERSION_MINOR "$ENV{OGBROWSER_VERSION_MINOR}")
-else()
+
+if (NOT DEFINED CPACK_PACKAGE_VERSION_MINOR)
     set(CPACK_PACKAGE_VERSION_MINOR "0")
 endif()
 
 
-if (DEFINED $ENV{OGBROWSER_VERSION_PATCH})
-    set(CPACK_PACKAGE_VERSION_PATCH "$ENV{OGBROWSER_VERSION_PATCH}")
-else()
+if (NOT DEFINED CPACK_PACKAGE_VERSION_PATCH)
     set(CPACK_PACKAGE_VERSION_PATCH "0")
 endif()