diff --git a/Package.swift b/Package.swift
index 33587029a..75a5a0b33 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,8 +11,8 @@ let package = Package(
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
-            name: "zstd",
-            targets: [ "zstd" ])
+            name: "libzstd",
+            targets: [ "libzstd" ])
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -22,10 +22,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "zstd",
+            name: "libzstd",
             path: "lib",
             sources: [ "common", "compress", "decompress", "dictBuilder" ],
-            publicHeadersPath: "include",
+            publicHeadersPath: "modulemap",
             cSettings: [
                 .headerSearchPath(".")
             ])
diff --git a/lib/include/zstd.h b/lib/include/zstd.h
deleted file mode 120000
index 61fb36420..000000000
--- a/lib/include/zstd.h
+++ /dev/null
@@ -1 +0,0 @@
-../zstd.h
\ No newline at end of file
diff --git a/lib/modulemap/module.modulemap b/lib/modulemap/module.modulemap
new file mode 100644
index 000000000..5e09fca9e
--- /dev/null
+++ b/lib/modulemap/module.modulemap
@@ -0,0 +1,4 @@
+module libzstd {
+    umbrella header "../zstd.h"
+    export *
+}