diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 177456c1e41ccd99fa84a01728e67f0d513c0d36..2b9e0ee7180b88da5335b9b0188edf035c9142a3 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -48,6 +48,8 @@ set(VIEWER_SYMBOL_FILE "" CACHE STRING "Name of tarball into which to place symb
 option(USE_CEF "Enable CEF media plugin" ON)
 option(USE_VLC "Enable VLC media plugin" ON)
 
+option(BUILD_EXPIREY "Use build expirey system" ON)
+
 if(LIBS_CLOSED_DIR)
   file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
 else(LIBS_CLOSED_DIR)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5f14ea04447ba49ba534163723ccdeb55aeedc61..7976f75778b0e67d2192c0d5a6ea13647e2bac8c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2149,6 +2149,10 @@ if( TARGET media_plugin_libvlc )
   target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE USE_VLC=1)
 endif()
 
+if(BUILD_EXPIREY)
+  target_compile_definitions(${VIEWER_BINARY_NAME} PRIVATE BUILD_EXPIREY=1)
+endif()
+
 if(USE_NFD)
   target_link_libraries(${VIEWER_BINARY_NAME} PUBLIC nfd )
 endif()
diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
index 6427f0248e0cfb7c71daf8ba2c212e298741cb6c..5f51414338f66fb5a52df355d564f48eef3ee53d 100644
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -185,6 +185,7 @@ std::string LLVersionInfo::getReleaseNotes()
 
 bool LLVersionInfo::isViewerExpired()
 {
+#ifdef BUILD_EXPIREY
 	static const U64 BUILD_TIME(UNIX_TIMESTAMP);
 	static const U64Seconds TEST_EXPIREY(BUILD_TIME + ((60 * 60) * 24 * 14)); // 14 days
 	static const U64Seconds PROJECT_EXPIREY(BUILD_TIME + ((60 * 60) * 24 * 30)); // 30 days
@@ -210,5 +211,7 @@ bool LLVersionInfo::isViewerExpired()
 		break;
 	}
 	}
+#endif
 	return false;
+
 }