diff --git a/srcpkgs/libswift b/srcpkgs/libswift
new file mode 120000
index 00000000000..7e5f6f29f7d
--- /dev/null
+++ b/srcpkgs/libswift
@@ -0,0 +1 @@
+swift
\ No newline at end of file
diff --git a/srcpkgs/swift/template b/srcpkgs/swift/template
index 1dfffd388bd..9e2a4888bf1 100644
--- a/srcpkgs/swift/template
+++ b/srcpkgs/swift/template
@@ -1,9 +1,9 @@
 # Template file for 'swift'
 pkgname=swift
 version=2.2.1
-revision=1
+revision=2
 nocross=yes
-depends="clang"
+depends="clang libswift"
 makedepends="libxml2-devel libuuid-devel libbsd-devel icu-devel libedit-devel"
 only_for_archs="x86_64"
 hostmakedepends="pkg-config ninja cmake icu swig clang python perl"
@@ -22,7 +22,7 @@ ${_head}/swift-lldb/${_tail}>swift-lldb-${version}.tar.gz
 ${_head}/swift-cmark/${_tail}>swift-cmark-${version}.tar.gz
 "
 checksum="
-95fb0da2282da15f2aada66dec07a26630e66caf9d68f2c9f492527e25962096
+e971e2287055da72564356f369bad97e95821afb1ef36157e954a04a7e90753a
 f7977e5bb275494b5dac4490afc5d634f894ba5f209f3b2dbd5b7e520fa5fce2
 40bdfa7eec0497ec69005d6a5d018b12c85aa2c0959d3408ecaaa9e34ff0415f
 2098043dbda98374e784d3357f71f8e931aea3ac958c042adf0df0fae7bc22a3
@@ -51,11 +51,18 @@ do_install() {
 	vbin bin/swift
 	ln -fs swift ${DESTDIR}/usr/bin/swiftc
 	ln -fs swift ${DESTDIR}/usr/bin/swift-autolink-extract
-	vman docs/tools/swift.1
-	vmkdir usr/lib/swift
-	rm -r -f lib/swift/install-tmp
-	rm -f lib/swift/clang
-	vcopy lib/swift/* usr/lib/swift
 	vmkdir usr/lib/swift/clang/include
 	vcopy ../llvm-linux-${XBPS_TARGET_MACHINE}/lib/clang/3.8.0/include/* usr/lib/swift/clang/include
+	vcopy lib/swift/shims usr/lib/swift
+	vman docs/tools/swift.1
+}
+
+libswift_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		cd ../build/Ninja-ReleaseAssert/swift-linux-${XBPS_TARGET_MACHINE}
+		vmkdir usr/lib/swift
+		vcopy lib/swift/linux usr/lib/swift
+		vcopy lib/swift/glibc usr/lib/swift
+	}
 }