diff --git a/CMakeLists.txt b/CMakeLists.txt
index 963d2714..5da29f54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ if(UNIX OR MINGW)
     endif()
   endif()
   if((UNIX AND BUILD64) OR (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8))
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
   else()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23a33253..f615e132 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,7 @@ if(WIN32)
     target_link_libraries(3dstool curl crypto)
   endif()
 else()
-  target_link_libraries(3dstool curl ssl crypto)
+  target_link_libraries(3dstool curl ssl crypto capstone)
   if(APPLE)
     target_link_libraries(3dstool ldap)
   else()
diff --git a/src/code.h b/src/code.h
index 7fea5b37..6f7f0ce0 100644
--- a/src/code.h
+++ b/src/code.h
@@ -2,7 +2,7 @@
 #define CODE_H_
 
 #include "utility.h"
-#include <capstone.h>
+#include <capstone/capstone.h>
 
 class CCode
 {