diff --git a/docs/changes.txt b/docs/changes.txt
index de79aed70..93781a736 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -52,6 +52,7 @@
 - Hash Parser: Fixed the use of strtok_r () calls
 - OpenCL Devices: Fixed several memory leaks in shutdown phase
 - OpenCL Runtime: Updated rocm detection
+- OpenCL Runtime: Enforce to use OpenCL version 1.2 to restrain OpenCL runtimes to make use of the __generic address space qualifier
 - OpenCL Kernels: Replace variables from uXX to uXXa if used in __constant space
 - OpenCL Kernels: Use a special kernel to initialize the password buffer used during autotune measurements, to reduce startup time
 - OpenCL Kernels: Use static declaraction for uXXa variables used in __constant space
diff --git a/src/opencl.c b/src/opencl.c
index 995cac90c..f8c77581d 100644
--- a/src/opencl.c
+++ b/src/opencl.c
@@ -4306,9 +4306,9 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
     char build_opts[1024] = { 0 };
 
     #if defined (_WIN)
-    snprintf (build_opts, sizeof (build_opts) - 1, "-I OpenCL -I \"%s\"", folder_config->cpath_real);
+    snprintf (build_opts, sizeof (build_opts) - 1, "-cl-std=CL1.2 -I OpenCL -I \"%s\"", folder_config->cpath_real);
     #else
-    snprintf (build_opts, sizeof (build_opts) - 1, "-I OpenCL -I %s", folder_config->cpath_real);
+    snprintf (build_opts, sizeof (build_opts) - 1, "-cl-std=CL1.2 -I OpenCL -I %s", folder_config->cpath_real);
     #endif
 
     // we don't have sm_* on vendors not NV but it doesn't matter