2 files changed, 6 insertions, 1 deletions

diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index cde64f8f..fb6d02e5 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -538,7 +538,7 @@ namespace WixToolset.Util
                     new XAttribute("Name", Path.GetFileNameWithoutExtension(row.FieldAsString(3))), // remove .lnk/.url extension because compiler extension adds it back for us
                     new XAttribute("Type", type),
                     new XAttribute("Target", row.FieldAsString(4)),
-                    new XAttribute("IconFile", row.FieldAsString(6)),
+                    AttributeIfNotNull("IconFile", row, 6),
                     NumericAttributeIfNotNull("IconIndex", row, 7)
                     );
 
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index a4fcaf14..2a2a2f6a 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Util</RootNamespace>
     <Description>WiX Toolset Utility extension</Description>
     <Title>WiX Toolset Utility extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>