diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec8f32..a7650da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [1.8.2]
+
+### Fixed
+ - CMake: Linux: overwrite FORTIFY_SOURCE from distribution
+
+### Changed
+ - update android logging
+
 ## [1.8.1]
 
 ### Changed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 243dfb0..0ab4b37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2016-2024 Intel Corporation
+# Copyright (C) 2016-2026 Intel Corporation
 cmake_minimum_required(VERSION 3.10)
 project(mei C)
 
@@ -42,6 +42,7 @@ set(COMPILE_OPTIONS
             --param
             ssp-buffer-size=4
             -ftrapv
+            -U_FORTIFY_SOURCE
             -D_FORTIFY_SOURCE=2
             -O2
             -Wformat
diff --git a/VERSION b/VERSION
index a8fdfda..53adb84 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.8.1
+1.8.2
diff --git a/mei.c b/mei.c
index 21cdee0..6b52191 100644
--- a/mei.c
+++ b/mei.c
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2013 - 2025 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2026 Intel Corporation. All rights reserved.
  *
  * Intel Management Engine Interface (Intel MEI) Library
  */
@@ -23,27 +23,17 @@
 /*****************************************************************************
  * Intel Management Engine Interface
  *****************************************************************************/
-#ifdef ANDROID
-#define LOG_TAG "libmei"
-#include <android/log_macros.h>
-#define mei_msg(_me, fmt, ARGS...) \
-((_me->log_level >= MEI_LOG_LEVEL_VERBOSE) \
-? (void)ALOGV(fmt, ##ARGS) \
-: (void)0)
-
-#define mei_err(_me, fmt, ARGS...) ALOGE(fmt, ##ARGS)
-#ifdef DEBUG
-static inline void __dump_buffer(const char *buf)
-{
-	ALOGV("%s\n", buf);
-}
-#endif /* DEBUG */
-
-#else /* ! ANDROID */
 #ifdef SYSLOG
-	#include <syslog.h>
-	#define __mei_msg(fmt, ...) syslog(LOG_DEBUG, fmt, ##__VA_ARGS__)
-	#define __mei_err(fmt, ...) syslog(LOG_ERR, fmt, ##__VA_ARGS__)
+	#ifdef ANDROID
+		#define LOG_TAG "libmei"
+		#include <android/log_macros.h>
+		#define __mei_msg(fmt, ...) ALOGV(fmt, ##__VA_ARGS__)
+		#define __mei_err(fmt, ...) ALOGE(fmt, ##__VA_ARGS__)
+	#else /* ANDROID */
+		#include <syslog.h>
+		#define __mei_msg(fmt, ...) syslog(LOG_DEBUG, fmt, ##__VA_ARGS__)
+		#define __mei_err(fmt, ...) syslog(LOG_ERR, fmt, ##__VA_ARGS__)
+	#endif /* ANDROID */
 #else
 	#include <stdlib.h>
 	#define __mei_msg(fmt, ...) fprintf(stdout, fmt, ##__VA_ARGS__)
@@ -80,10 +70,7 @@ static inline void __dump_buffer(const char *buf)
 {
 	__mei_msg("%s\n", buf);
 }
-#endif /* DEBUG */
-#endif /* ANDROID */
 
-#ifdef DEBUG
 static void dump_hex_buffer(const unsigned char *buf, size_t len)
 {
 #define LINE_LEN 16