diff --git a/Package.swift b/Package.swift
index e69de29..7d7b5f3 100644
--- a/Package.swift
+++ b/Package.swift
@@ -0,0 +1,10 @@
+import PackageDescription
+
+let package = Package(
+    name: "CEHVTP",
+    pkgConfig: "evhtp",
+    providers: [
+        .Apt("libevhtp-dev"),
+        .Brew("libevhtp")
+    ]
+)
diff --git a/cevhtp.h b/cevhtp.h
new file mode 100644
index 0000000..c237485
--- /dev/null
+++ b/cevhtp.h
@@ -0,0 +1,24 @@
+//===--- cevhtp.h  -------------------------------------------------------===//
+//
+//Copyright (c) 2016 Daniel Leping (dileping)
+//
+//This file is part of CEVHTP.
+//
+//PathToRegex is free software: you can redistribute it and/or modify
+//it under the terms of the GNU Lesser General Public License as published by
+//the Free Software Foundation, either version 3 of the License, or
+//(at your option) any later version.
+//
+//PathToRegex is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU Lesser General Public License for more details.
+//
+//You should have received a copy of the GNU Lesser General Public License
+//along with PathToRegex.  If not, see <http://www.gnu.org/licenses/>.
+//
+//===----------------------------------------------------------------------===//
+
+#include <evhtp/evhtp.h>
+#include <evhtp/htparse.h>
+#include <event2/thread.h>
diff --git a/module.modulemap b/module.modulemap
index 10b50f9..712dfcd 100644
--- a/module.modulemap
+++ b/module.modulemap
@@ -20,8 +20,7 @@
 //===----------------------------------------------------------------------===//
 
 module CEVHTP [system] {
-	header "/usr/local/include/evhtp.h"
-	header "/usr/local/include/htparse.h"
+	umbrella header "cevhtp.h"
 	link "evhtp"
 	link "ssl"
 	link "crypto"