diff --git a/Rebus/Rebus.csproj b/Rebus/Rebus.csproj
index 252d35d20..4f6ac9dc8 100644
--- a/Rebus/Rebus.csproj
+++ b/Rebus/Rebus.csproj
@@ -17,6 +17,17 @@
     <RepositoryUrl>https://github.com/rebus-org/Rebus</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PostBuildEvent></PostBuildEvent>
+    <Product>Rebus</Product>
+    <PackageId>Rebus</PackageId>
+    
+    <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+ 
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+
+    <!-- Optional: Include the PDB in the built .nupkg -->
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,7 +40,7 @@
     <DocumentationFile>bin\Debug\Rebus.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>RELEASE</DefineConstants>
@@ -47,6 +58,12 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(EnableSourceLink)' != 'false'">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
diff --git a/appveyor.yml b/appveyor.yml
index 897d9cae7..3bef67a16 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,6 @@ before_build:
   - appveyor-retry dotnet restore -v Minimal
 
 build_script:
-  - dotnet build Rebus                  -c Release 
-  - dotnet build Rebus.Tests.Contracts  -c Release /p:WarningLevel=3
-  - dotnet build Rebus.Tests            -c Release /p:WarningLevel=3
+  - dotnet build Rebus                  -c Release /p:EnableSourceLink=false
+  - dotnet build Rebus.Tests.Contracts  -c Release /p:WarningLevel=3 /p:EnableSourceLink=false
+  - dotnet build Rebus.Tests            -c Release /p:WarningLevel=3 /p:EnableSourceLink=false