diff --git a/.gitignore b/.gitignore
index 826d41ea2..67ee24c67 100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ _Version.h
 applet/
 *.DS_Store
 
-
 #
 # Misc
 #
@@ -124,6 +123,29 @@ tags
 .gcc-flags.json
 /lib/
 
+# Workaround for Deviot+platformio quirks
+Marlin/lib
+Marlin/platformio.ini
+Marlin/*/platformio.ini
+Marlin/*/*/platformio.ini
+Marlin/*/*/*/platformio.ini
+Marlin/*/*/*/*/platformio.ini
+Marlin/.travis.yml
+Marlin/*/.travis.yml
+Marlin/*/*/.travis.yml
+Marlin/*/*/*/.travis.yml
+Marlin/*/*/*/*/.travis.yml
+Marlin/.gitignore
+Marlin/*/.gitignore
+Marlin/*/*/.gitignore
+Marlin/*/*/*/.gitignore
+Marlin/*/*/*/*/.gitignore
+Marlin/readme.txt
+Marlin/*/readme.txt
+Marlin/*/*/readme.txt
+Marlin/*/*/*/readme.txt
+Marlin/*/*/*/*/readme.txt
+
 #Visual Studio
 *.sln
 *.vcxproj