diff --git a/.gitignore b/.gitignore
index cdee061ed..843a9fc23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,9 +152,30 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
-# JetBrains Rider IDE files
-.idea/
-
 #System.IO.Abstractions specific ignores
 Releases
 System.IO.Abstractions.*.nupkg
+
+# Common IntelliJ Platform excludes
+# https://github.com/JetBrains/resharper-rider-samples/blob/master/.gitignore
+
+# User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/httpRequests/
+
+# Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+# Rider
+# Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
\ No newline at end of file
diff --git a/.idea/.idea.System.IO.Abstractions/.idea/.gitignore b/.idea/.idea.System.IO.Abstractions/.idea/.gitignore
new file mode 100644
index 000000000..9b9147a9b
--- /dev/null
+++ b/.idea/.idea.System.IO.Abstractions/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/contentModel.xml
+/projectSettingsUpdater.xml
+/.idea.System.IO.Abstractions.iml
+/modules.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/.idea.System.IO.Abstractions/.idea/encodings.xml b/.idea/.idea.System.IO.Abstractions/.idea/encodings.xml
new file mode 100644
index 000000000..df87cf951
--- /dev/null
+++ b/.idea/.idea.System.IO.Abstractions/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.System.IO.Abstractions/.idea/indexLayout.xml b/.idea/.idea.System.IO.Abstractions/.idea/indexLayout.xml
new file mode 100644
index 000000000..7b08163ce
--- /dev/null
+++ b/.idea/.idea.System.IO.Abstractions/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/.idea.System.IO.Abstractions/.idea/vcs.xml b/.idea/.idea.System.IO.Abstractions/.idea/vcs.xml
new file mode 100644
index 000000000..94a25f7f4
--- /dev/null
+++ b/.idea/.idea.System.IO.Abstractions/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/System.IO.Abstractions.sln b/System.IO.Abstractions.sln
index bfa242190..cc1d4ec7a 100644
--- a/System.IO.Abstractions.sln
+++ b/System.IO.Abstractions.sln
@@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{BBF7AD8D-5522-48
 		README.md = README.md
 		version.json = version.json
 		Directory.Packages.props = Directory.Packages.props
+		.gitignore = .gitignore
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{2BE9161B-A3F3-4511-81DB-DB1DCB6375C9}"