diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 588f5bf..9158a68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,22 @@ set (mraa_LIB_SRCS_NOAUTO
   ${PROJECT_SOURCE_DIR}/src/uart/uart.c
 )
 
+set (mraa_LIB_X86_SRCS_NOAUTO
+  ${PROJECT_SOURCE_DIR}/src/x86/x86.c
+  ${PROJECT_SOURCE_DIR}/src/x86/intel_galileo_rev_d.c
+  ${PROJECT_SOURCE_DIR}/src/x86/intel_galileo_rev_g.c
+  ${PROJECT_SOURCE_DIR}/src/x86/intel_edison_fab_c.c
+  ${PROJECT_SOURCE_DIR}/src/x86/intel_de3815.c
+  ${PROJECT_SOURCE_DIR}/src/x86/intel_minnow_max.c
+)
+
+set (mraa_LIB_ARM_SRCS_NOAUTO
+  ${PROJECT_SOURCE_DIR}/src/arm/arm.c
+  ${PROJECT_SOURCE_DIR}/src/arm/raspberry_pi.c
+  ${PROJECT_SOURCE_DIR}/src/arm/beaglebone.c
+  ${PROJECT_SOURCE_DIR}/src/arm/banana.c
+)
+
 if (X86PLAT)
   add_subdirectory(x86)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DX86PLAT=1")
@@ -29,7 +45,7 @@ if (ARMPLAT)
 endif()
 
 set (mraa_LIB_SRCS
-  ${mraa_LIB_SRCS_NOAUTO}
+  ${mraa_LIB_PLAT_SRCS_NOAUTO}
 # autogenerated version file
   ${CMAKE_CURRENT_BINARY_DIR}/version.c
 )
diff --git a/src/arm/CMakeLists.txt b/src/arm/CMakeLists.txt
index 973dc5a..4d3c247 100644
--- a/src/arm/CMakeLists.txt
+++ b/src/arm/CMakeLists.txt
@@ -1,8 +1,3 @@
 message (INFO " - Adding ARM platforms")
-set (mraa_LIB_SRCS_NOAUTO ${mraa_LIB_SRCS_NOAUTO}
-  ${PROJECT_SOURCE_DIR}/src/arm/arm.c
-  ${PROJECT_SOURCE_DIR}/src/arm/raspberry_pi.c
-  ${PROJECT_SOURCE_DIR}/src/arm/beaglebone.c
-  ${PROJECT_SOURCE_DIR}/src/arm/banana.c
-  PARENT_SCOPE
-)
+set (mraa_LIB_PLAT_SRCS_NOAUTO ${mraa_LIB_SRCS_NOAUTO}
+     ${mraa_LIB_ARM_SRCS_NOAUTO} PARENT_SCOPE)
diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt
index 58f5894..e06e1f5 100644
--- a/src/javascript/CMakeLists.txt
+++ b/src/javascript/CMakeLists.txt
@@ -31,7 +31,11 @@ mraa_create_install_package_json (package.json lib/node_modules/mraa)
 
 macro (mraa_CREATE_BINDING_GYP generated_file)
   set (mraa_LIB_SRCS_GYP "")
-  foreach (srcfile ${mraa_LIB_SRCS_NOAUTO})
+  set (mraa_NPM_SRCS ${mraa_LIB_SRCS_NOAUTO}
+                     ${mraa_LIB_ARM_SRCS_NOAUTO}
+                     ${mraa_LIB_X86_SRCS_NOAUTO}
+  )
+  foreach (srcfile ${mraa_NPM_SRCS})
     file (RELATIVE_PATH rel ${CMAKE_SOURCE_DIR} ${srcfile})
     set (mraa_LIB_SRCS_GYP "'${rel}',\n${mraa_LIB_SRCS_GYP}")
   endforeach (srcfile)
diff --git a/src/javascript/binding.gyp.cmake b/src/javascript/binding.gyp.cmake
index d7e882b..ffab094 100644
--- a/src/javascript/binding.gyp.cmake
+++ b/src/javascript/binding.gyp.cmake
@@ -10,16 +10,25 @@
 @mraa_LIB_INCLUDE_DIRS_GYP@
                       ],
       'variables': {
-          "v8_version%": "<!(node -e 'console.log(process.versions.v8)' | sed 's/\.//g')"
+          "v8_version%": "<!(node -e 'console.log(process.versions.v8)' | sed 's/\.//g')",
+          "arch%": "<!(node -e 'console.log(process.arch)')"
       },
       'cflags_cc!': [ '-fno-rtti', '-fno-exceptions' ],
       'cflags!': [ '-fno-exceptions' ],
+      'conditions' : [
+          [ 'arch=="x64"' or 'arch=="ia32"',
+            { 'defines' : [ 'X86PLAT=ON' ], },
+          ],
+          [ 'arch=="arm"',
+            { 'defines' : [ 'ARMPLAT=ON'], },
+          ],
+      ],
       'defines' : [ 'SWIG',
                     'SWIGJAVASCRIPT',
                     'BUILDING_NODE_EXTENSION=1',
                     'SWIG_V8_VERSION=0x0<(v8_version)',
-                    'V8_VERSION=0x0<(v8_version)',
-                    'X86PLAT=ON' ]
+                    'V8_VERSION=0x0<(v8_version)'
+      ]
     }
   ]
 }
diff --git a/src/x86/CMakeLists.txt b/src/x86/CMakeLists.txt
index 7b14d6d..c0f8c50 100644
--- a/src/x86/CMakeLists.txt
+++ b/src/x86/CMakeLists.txt
@@ -1,10 +1,3 @@
 message (INFO " - Adding x86 platforms")
-set (mraa_LIB_SRCS_NOAUTO ${mraa_LIB_SRCS_NOAUTO}
-  ${PROJECT_SOURCE_DIR}/src/x86/x86.c
-  ${PROJECT_SOURCE_DIR}/src/x86/intel_galileo_rev_d.c
-  ${PROJECT_SOURCE_DIR}/src/x86/intel_galileo_rev_g.c
-  ${PROJECT_SOURCE_DIR}/src/x86/intel_edison_fab_c.c
-  ${PROJECT_SOURCE_DIR}/src/x86/intel_de3815.c
-  ${PROJECT_SOURCE_DIR}/src/x86/intel_minnow_max.c
-  PARENT_SCOPE
-)
+set (mraa_LIB_PLAT_SRCS_NOAUTO ${mraa_LIB_SRCS_NOAUTO}
+     ${mraa_LIB_X86_SRCS_NOAUTO} PARENT_SCOPE)