diff --git a/README.md b/README.md
index cb988ce0..1435929d 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Google test has been used on a variety of platforms:
   * MinGW
   * Windows Mobile
   * Symbian
+  * PlatformIO
 
 ## Who Is Using Google Test? ##
 
diff --git a/googletest/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc
index 204d4607..499ec587 100644
--- a/googletest/src/gtest-filepath.cc
+++ b/googletest/src/gtest-filepath.cc
@@ -92,8 +92,9 @@ static bool IsPathSeparator(char c) {
 
 // Returns the current working directory, or "" if unsuccessful.
 FilePath FilePath::GetCurrentDir() {
-#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT
-  // Windows CE doesn't have a current directory, so we just return
+#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || \
+    GTEST_OS_WINDOWS_RT || ARDUINO
+  // Windows CE and Arduino don't have a current directory, so we just return
   // something reasonable.
   return FilePath(kCurrentDirectoryString);
 #elif GTEST_OS_WINDOWS
diff --git a/library.json b/library.json
index 84c2b8c8..d8392726 100644
--- a/library.json
+++ b/library.json
@@ -27,6 +27,7 @@
             "googlemock/make",
             "googlemock/msvc",
             "googlemock/scripts",
+            "googlemock/src/gmock_all.cc",
             "googlemock/src/gmock_main.cc",
             "googlemock/test",
             "googlemock/CMakeLists.txt",
@@ -38,6 +39,7 @@
             "googletest/make",
             "googletest/msvc",
             "googletest/scripts",
+            "googletest/src/gtest_all.cc",
             "googletest/src/gtest_main.cc",
             "googletest/test",
             "googletest/xcode",