diff --git a/.gitignore b/.gitignore
index 5d3dd6633..bc5899dc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@
 x64/
 x86/
 build/
-bld/
 [Bb]in/
 [Oo]bj/
 
diff --git a/MoreLinq.Test/MoreLinq.Test.csproj b/MoreLinq.Test/MoreLinq.Test.csproj
index f76c03a0e..4a599e037 100644
--- a/MoreLinq.Test/MoreLinq.Test.csproj
+++ b/MoreLinq.Test/MoreLinq.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\dotnet-netfx-mono.props" />
+  <Import Project="..\bld\DotNetSdkMono.props" />
 
   <PropertyGroup>
     <AssemblyTitle>MoreLinq.Test</AssemblyTitle>
diff --git a/MoreLinq/MoreLinq.csproj b/MoreLinq/MoreLinq.csproj
index c4a47c648..7413ae51c 100644
--- a/MoreLinq/MoreLinq.csproj
+++ b/MoreLinq/MoreLinq.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\dotnet-netfx-mono.props" />
+  <Import Project="..\bld\DotNetSdkMono.props" />
+  <Import Project="..\bld\Copyright.props" />
 
   <PropertyGroup>
     <Title>MoreLINQ</Title>
@@ -99,7 +100,7 @@
         - ZipShortest
     </Description>
     <Description>$([System.Text.RegularExpressions.Regex]::Replace($(Description), `\s+`, ` `).Trim().Replace(` - `, `, `).Replace(`:,`, `:`))</Description>
-    <Copyright>&#169; 2008 Jonathan Skeet. Portions &#169; 2009 Atif Aziz, Chris Ammerman, Konrad Rudolph. Portions &#169; 2010 Johannes Rudolph, Leopold Bushkin. Portions &#169; 2015 Felipe Sateler, &#8220;sholland&#8221;. Portions &#169; 2016 Andreas Gullberg Larsen, Leandro F. Vieira (leandromoh). Portions &#169; 2017 Jonas Nyrup (jnyrup). Portions &#169; Microsoft. All rights reserved.</Copyright>
+    <Copyright>$([System.Text.RegularExpressions.Regex]::Replace($(Copyright), `\s+`, ` `).Trim())</Copyright>
     <AssemblyTitle>MoreLINQ</AssemblyTitle>
     <NeutralLanguage>en-US</NeutralLanguage>
     <VersionPrefix>3.0.0</VersionPrefix>
diff --git a/bld/Copyright.props b/bld/Copyright.props
new file mode 100644
index 000000000..62e21672d
--- /dev/null
+++ b/bld/Copyright.props
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>
+        &#169; 2008 Jonathan Skeet.
+        Portions &#169; 2009 Atif Aziz, Chris Ammerman, Konrad Rudolph.
+        Portions &#169; 2010 Johannes Rudolph, Leopold Bushkin.
+        Portions &#169; 2015 Felipe Sateler, &#8220;sholland&#8221;.
+        Portions &#169; 2016 Andreas Gullberg Larsen, Leandro F. Vieira (leandromoh).
+        Portions &#169; 2017 Jonas Nyrup (jnyrup).
+        Portions &#169; Microsoft. All rights reserved.
+    </Copyright>
+  </PropertyGroup>
+</Project>
diff --git a/dotnet-netfx-mono.props b/bld/DotNetSdkMono.props
similarity index 100%
rename from dotnet-netfx-mono.props
rename to bld/DotNetSdkMono.props