diff --git a/README.md b/README.md
index 5a10bba..8810c42 100644
--- a/README.md
+++ b/README.md
@@ -56,11 +56,10 @@ This library does NOT provide any event system or any high level abstractions.
 
 See the example folder for information of how to use tinycsocket.
 
-Currently support platforms:
+Currently supported platforms:
 - Windows NT 5.0 SP1 (Windows 2000 SP1) or newer.
-- POSIX.1-2001 compliant systems (Linux, FreeBSD and Solaris etc.)
-
-Note that MacOS is currently not tested or officially supported (but it "should" work (TM)).
+- POSIX.1-2001 compliant systems (Linux, FreeBSD, OpenBSD, MacOS, Solaris etc.)
+- Android (API level 24+, partial support for earlier versions)
 
 # Installation instructions
 
@@ -129,23 +128,29 @@ like.
 
 These platforms are tested for every pull request. All configurations are tested as both static library and header-only.
 
-| OS                                | Compiler                           | WINVER |
-|-----------------------------------|------------------------------------|--------|
-| Windows Server 2025               | MSVC v19.44 x86                    |        |
-| Windows Server 2025               | MSVC v19.44 x64                    |        |
-| Windows Server 2025               | i686-w64-mingw32-gcc-posix v13     | 0x500  |
-| Windows Server 2025               | i686-w64-mingw32-gcc-posix v13     | 0x502  |
-| Windows Server 2025               | i686-w64-mingw32-gcc v15.2         | 0x603  |
-| Windows Server 2025               | x86_64-w64-mingw32-gcc-posix v13   | 0x502  |
-| Windows Server 2025               | x86_64-w64-mingw32-gcc v15.2       | 0x603  |
-| Wine (Alpine 3.23)                | MSVC v19.44 x86                    |        |
-| Wine (Alpine 3.23)                | MSVC v19.44 x64                    |        |
-| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc-posix v13     | 0x500  |
-| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc-posix v13     | 0x502  |
-| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc v15.2         | 0x603  |
-| Wine (Alpine 3.23)                | x86_64-w64-mingw32-gcc-posix v13   | 0x502  |
-| Wine (Alpine 3.23)                | x86_64-w64-mingw32-gcc v15.2       | 0x603  |
-| Linux Alpine 3.23 x86_64 musl     | gcc v15.2                          |        |
-| Linux Alpine 3.23 x86 musl        | gcc v15.2                          |        |
-| Linux Ubuntu 24.04 x86_64 glibc   | gcc v13.3                          |        |
-| Linux Ubuntu 24.04 x86 glibc      | gcc v13.3                          |        |
+| OS                                | Compiler                           | Arch     | Notes        |
+|-----------------------------------|------------------------------------|----------|--------------|
+| Windows Server 2025               | MSVC v19.44                        | x86      |              |
+| Windows Server 2025               | MSVC v19.44                        | x64      |              |
+| Windows Server 2025               | i686-w64-mingw32-gcc-posix v13     | x86      | WINVER 0x500 |
+| Windows Server 2025               | i686-w64-mingw32-gcc-posix v13     | x86      | WINVER 0x502 |
+| Windows Server 2025               | i686-w64-mingw32-gcc v15.2         | x86      | WINVER 0x603 |
+| Windows Server 2025               | x86_64-w64-mingw32-gcc-posix v13   | x64      | WINVER 0x502 |
+| Windows Server 2025               | x86_64-w64-mingw32-gcc v15.2       | x64      | WINVER 0x603 |
+| Wine (Alpine 3.23)                | MSVC v19.44                        | x86      |              |
+| Wine (Alpine 3.23)                | MSVC v19.44                        | x64      |              |
+| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc-posix v13     | x86      | WINVER 0x500 |
+| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc-posix v13     | x86      | WINVER 0x502 |
+| Wine (Alpine 3.23)                | i686-w64-mingw32-gcc v15.2         | x86      | WINVER 0x603 |
+| Wine (Alpine 3.23)                | x86_64-w64-mingw32-gcc-posix v13   | x64      | WINVER 0x502 |
+| Wine (Alpine 3.23)                | x86_64-w64-mingw32-gcc v15.2       | x64      | WINVER 0x603 |
+| Linux Alpine 3.23 (musl)          | gcc v15.2                          | x86_64   |              |
+| Linux Alpine 3.23 (musl)          | gcc v15.2                          | x86      |              |
+| Linux Ubuntu 24.04 (glibc)        | gcc v13.3                          | x86_64   |              |
+| Linux Ubuntu 24.04 (glibc)        | gcc v13.3                          | x86      |              |
+| Linux Ubuntu 24.04 (glibc)        | s390x-linux-gnu-gcc                | s390x    | Big-endian   |
+| MacOS (latest)                    | Apple Clang                        | arm64    |              |
+| FreeBSD 15.0                      | Clang 19.1                         | x86_64   |              |
+| OpenBSD (latest)                  | Clang                              | x86_64   |              |
+| Android API 24 (Bionic)           | NDK Clang                          | x86_64   | Emulator     |
+| Cygwin (Windows Server 2025)      | gcc                                | x86_64   |              |
diff --git a/include/tinycsocket.h b/include/tinycsocket.h
index 8a9abec..683a97f 100644
--- a/include/tinycsocket.h
+++ b/include/tinycsocket.h
@@ -29,7 +29,7 @@
 #ifndef TINYCSOCKET_INTERNAL_H_
 #define TINYCSOCKET_INTERNAL_H_
 
-static const char* const TCS_VERSION_TXT = "v0.3.63";
+static const char* const TCS_VERSION_TXT = "v0.3.64";
 static const char* const TCS_LICENSE_TXT =
     "Copyright 2018 Markus Lindelöw\n"
     "\n"
diff --git a/src/tinycsocket_internal.h b/src/tinycsocket_internal.h
index cbe046c..a7a347e 100644
--- a/src/tinycsocket_internal.h
+++ b/src/tinycsocket_internal.h
@@ -23,7 +23,7 @@
 #ifndef TINYCSOCKET_INTERNAL_H_
 #define TINYCSOCKET_INTERNAL_H_
 
-static const char* const TCS_VERSION_TXT = "v0.3.63";
+static const char* const TCS_VERSION_TXT = "v0.3.64";
 static const char* const TCS_LICENSE_TXT =
     "Copyright 2018 Markus Lindelöw\n"
     "\n"