diff --git a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
index 6444def9f..6261a283e 100644
--- a/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
+++ b/ICSharpCode.Decompiler/CSharp/WholeProjectDecompiler.cs
@@ -463,8 +463,8 @@ namespace ICSharpCode.Decompiler.CSharp
 					b.Append('.'); // allow dot, but never two in a row
 				else
 					b.Append('-');
-				if (b.Length >= 64)
-					break; // limit to 64 chars
+				if (b.Length >= 200)
+					break; // limit to 200 chars
 			}
 			if (b.Length == 0)
 				b.Append('-');
diff --git a/ILSpy/Properties/app.config.template b/ILSpy/Properties/app.config.template
index 1a68767cc..6922fed23 100644
--- a/ILSpy/Properties/app.config.template
+++ b/ILSpy/Properties/app.config.template
@@ -4,8 +4,7 @@
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
 	</startup>
 	<runtime>
-		<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false" />
-		
+		<AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false;Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<!-- The redirects allow using AddIns with a different ILSpy version than they were compiled against. -->
 			<!-- No guarantee they'll work correctly, though (there might be breaking API changes in ILSpy). -->
diff --git a/ILSpy/app.manifest b/ILSpy/app.manifest
index dc49849b8..f9ecc04dd 100644
--- a/ILSpy/app.manifest
+++ b/ILSpy/app.manifest
@@ -52,6 +52,9 @@
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+		
+	  <!-- Enable long path support: https://blogs.msdn.microsoft.com/jeremykuhne/2016/07/30/net-4-6-2-and-long-paths-on-windows-10/ -->
+      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
     </windowsSettings>
   </application>