diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee897b4..de1f728 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,9 @@ if (WIN32 AND NOT MSVC)
     
     # Match resource architecture with target architecture
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-i386")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i386 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i386 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -DATOMIC_FORCE_NO_ATOMICS")
+        set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-i486")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i486 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i486 -mtune=generic -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -DATOMIC_FORCE_NO_ATOMICS")
     else()
         set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -F pe-x86-64")
     endif()
@@ -261,10 +261,6 @@ ELSE()
     # Link required Windows system libraries for OpenSSL
     if (WIN32)
         target_link_libraries(umskt crypt32 ws2_32)
-        # if 32-bit windows, add the atomic library
-        if (CMAKE_SIZEOF_VOID_P EQUAL 4 AND NOT MSVC)
-            target_link_libraries(umskt atomic)
-        endif()
     endif()
 
     IF(MSVC AND MSVC_MSDOS_STUB)