diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10a50691d..c1e78d1d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
 option (BUILD_TESTS "Override building of tests" ON)
 option (ENABLE_COVERAGE "Build with coverage")
 
-if (DEFINED ENV{SYNERGY_ENTERPRISE})
+if ($ENV{SYNERGY_ENTERPRISE})
     option (SYNERGY_ENTERPRISE "Build Enterprise" ON)
 else()
     option (SYNERGY_ENTERPRISE "Build Enterprise" OFF)
diff --git a/ChangeLog b/ChangeLog
index 15e20db53..dd4889b93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ Bug fixes:
 - #6941 The application doesn't recognize old settings
 - #6945 Fix build for Raspberry Pi
 - #6946 Add build stage to filename
+- #6951 Fix issue creating standard version for Raspberry Pi
 
 Enhancements:
 - #6912 Removes UI for Screen Saver Sync and Files Drag and Drop