diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a9d7130..cd685a2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,11 +48,17 @@ ENDIF()
 
 OPTION(ENABLE_ASM "Enable x86 ASM related options" ${ASM_DEFAULT})
 
-SET(ASM_CORE_DEFAULT ${ENABLE_ASM})
+# The ARM ASM core seems to be very buggy, see #98 and #54. Default to it being
+# OFF for the time being, until it is either fixed or replaced.
+option( ENABLE_ASM_CORE "Enable x86 ASM CPU cores" OFF)
+
+IF(ENABLE_ASM_CORE)
+    MESSAGE(WARNING "!!!!!! The x86 ASM cores are considered buggy and dangerous, use at your own risk. !!!!!!")
+ENDIF()
+
 SET(ASM_SCALERS_DEFAULT ${ENABLE_ASM})
 SET(MMX_DEFAULT ${ENABLE_ASM})
 
-option( ENABLE_ASM_CORE "Enable x86 ASM CPU cores" ${ASM_CORE_DEFAULT})
 option( ENABLE_ASM_SCALERS "Enable x86 ASM graphic filters" ${ASM_SCALERS_DEFAULT})
 
 if(ENABLE_ASM_SCALERS)
diff --git a/README.md b/README.md
index 62d4ff22..e6a82998 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Here is the complete list:
 | ENABLE_DEBUGGER      | Enable the debugger                                                  | ON                    |
 | ENABLE_NLS           | Enable translations                                                  | ON                    |
 | ENABLE_ASM           | Enable the following three ASM options                               | ON for 32 bit builds  |
-| ENABLE_ASM_CORE      | Enable x86 ASM CPU cores                                             | ON for 32 bit builds  |
+| ENABLE_ASM_CORE      | Enable x86 ASM CPU cores (**BUGGY AND DANGEROUS**)                   | OFF                   |
 | ENABLE_ASM_SCALERS   | Enable x86 ASM graphic filters                                       | ON for 32 bit builds  |
 | ENABLE_MMX           | Enable MMX                                                           | ON for 32 bit builds  |
 | ENABLE_LINK          | Enable GBA linking functionality (requires SFML)                     | ON                    |