diff --git a/README.md b/README.md
index 7ed7470..d0d71aa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with .NET Standard 2.0.
 
-FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10).
+FreeImage native binaries are included in the nuget package for Windows x86/x64, Linux x64/armhf, and OSX x64 (^10.10).
 
 For other platforms they will have to be installed separately. Note that the native function calls require the library filename to be "FreeImage," so symlinking may be required (eg. "sudo ln -s /usr/lib/x86_64-linux-gnu/libfreeimage.so /usr/lib/FreeImage").
 
diff --git a/runtimes/ubuntu.16.04-x64/native/libfreeimage-3.17.0.so b/runtimes/linux-x64/native/libfreeimage-3.17.0.so
similarity index 100%
rename from runtimes/ubuntu.16.04-x64/native/libfreeimage-3.17.0.so
rename to runtimes/linux-x64/native/libfreeimage-3.17.0.so
diff --git a/runtimes/win7-x64/native/FreeImage.dll b/runtimes/win-x64/native/FreeImage.dll
similarity index 100%
rename from runtimes/win7-x64/native/FreeImage.dll
rename to runtimes/win-x64/native/FreeImage.dll
diff --git a/runtimes/win7-x86/native/FreeImage.dll b/runtimes/win-x86/native/FreeImage.dll
similarity index 100%
rename from runtimes/win7-x86/native/FreeImage.dll
rename to runtimes/win-x86/native/FreeImage.dll
diff --git a/src/FreeImage.Standard/FreeImage.Standard.csproj b/src/FreeImage.Standard/FreeImage.Standard.csproj
index 282be47..ca3c062 100644
--- a/src/FreeImage.Standard/FreeImage.Standard.csproj
+++ b/src/FreeImage.Standard/FreeImage.Standard.csproj
@@ -20,7 +20,7 @@
     <Description>
       This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with dotnet core. Note that all functions that use System.Drawing.Bitmap have been removed from the netstandard framework versions as there is no implementation for this class.
 
-      FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10).
+      FreeImage native binaries are included in the nuget package for Windows x86/x64, Linux x64/armhf, and OSX x64 (^10.10).
 
       For other platforms they will have to be installed separately. Note that the native function calls require the the library filename to be "FreeImage," so symlinking may be required (eg. "sudo ln -s /usr/lib/x86_64-linux-gnu/libfreeimage.so /usr/lib/FreeImage").
 
@@ -30,12 +30,12 @@
 
   <ItemGroup>
 
-    <None Include="..\..\runtimes\win7-x64\native\FreeImage.dll">
-      <PackagePath>runtimes/win7-x64/native/FreeImage.dll</PackagePath>
+    <None Include="..\..\runtimes\win-x64\native\FreeImage.dll">
+      <PackagePath>runtimes/win-x64/native/FreeImage.dll</PackagePath>
       <Pack>true</Pack>
     </None>
-    <None Include="..\..\runtimes\win7-x86\native\FreeImage.dll">
-      <PackagePath>runtimes/win7-x86/native/FreeImage.dll</PackagePath>
+    <None Include="..\..\runtimes\win-x86\native\FreeImage.dll">
+      <PackagePath>runtimes/win-x86/native/FreeImage.dll</PackagePath>
       <Pack>true</Pack>
     </None>
 
@@ -46,8 +46,8 @@
     </None>
 
     <!-- NOTE: this is renaming to FreeImage... might be avoidable if dll mapping is implemented: https://github.com/dotnet/coreclr/issues/930 -->
-    <None Include="..\..\runtimes\ubuntu.16.04-x64\native\libfreeimage-3.17.0.so">
-      <PackagePath>runtimes/ubuntu.16.04-x64/native/FreeImage.so</PackagePath>
+    <None Include="..\..\runtimes\linux-x64\native\libfreeimage-3.17.0.so">
+      <PackagePath>runtimes/linux-x64/native/FreeImage.so</PackagePath>
       <Pack>true</Pack>
     </None>