diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5231f1f929..467e760ea0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -531,6 +531,9 @@ endif()
 if(NOT DEFINED NEO_OCLOC_VERSION_MODE)
   set(NEO_OCLOC_VERSION_MODE "1")
 endif()
+if(NOT DEFINED NEO_BUILD_UNVERSIONED_OCLOC)
+  set(NEO_BUILD_UNVERSIONED_OCLOC FALSE)
+endif()
 include(platforms.cmake)
 list(LENGTH ALL_PRODUCT_FAMILY_LIST ALL_PRODUCT_FAMILY_LIST_COUNT)
 if(1 EQUAL ${ALL_PRODUCT_FAMILY_LIST_COUNT})
diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt
index 9bd4ad3b6a..0e3db5bf25 100644
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -469,7 +469,9 @@ elseif(UNIX)
     set(NEO_OCLOC_FORMER_LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${OCLOC_NAME}${NEO__LEGACY_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
 
-  set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}")
+  if(NOT NEO_BUILD_UNVERSIONED_OCLOC)
+    set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCLOC_VERSION_MODE}")
+  endif()
 endif()
 set_target_properties(${OCLOC_NAME} PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${OCLOC_OUTPUT_NAME_SUFFIX})
 set_target_properties(${OCLOC_NAME}_lib PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${LIBOCLOC_OUTPUT_NAME_SUFFIX})