diff --git a/.travis.yml b/.travis.yml
index 359cc59a..f0576c3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,10 @@ matrix:
       dist: trusty
       sudo: required
       env: RID=linux-x64
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: RID=linux-arm64
     - os: linux
       dist: trusty
       sudo: required
diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64
new file mode 100644
index 00000000..c9c21af6
--- /dev/null
+++ b/Dockerfile.linux-arm64
@@ -0,0 +1,17 @@
+FROM ubuntu:16.04
+
+WORKDIR /nativebinaries
+COPY . /nativebinaries/
+
+RUN dpkg --add-architecture arm64 \
+&& sed -i 's/deb/deb [arch=amd64]/g' /etc/apt/sources.list \
+&& echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports xenial main universe" > /etc/apt/sources.list.d/arm64.list \
+&& echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports xenial-updates main universe" > /etc/apt/sources.list.d/arm64-updates.list
+
+RUN apt update \
+&& apt -y install cmake pkg-config \
+   crossbuild-essential-arm64 \
+   pkg-config-aarch64-linux-gnu \
+   libssl-dev:arm64
+
+CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1
index f9ead7bb..a09cbbf6 100644
--- a/UpdateLibgit2ToSha.ps1
+++ b/UpdateLibgit2ToSha.ps1
@@ -123,6 +123,7 @@ Push-Location $libgit2Directory
     $dllConfig = @"
 <configuration>
     <dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/linux-x64/lib$binaryFilename.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="$binaryFilename" target="lib/linux-arm64/lib$binaryFilename.so" />
     <dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="lib/osx/lib$binaryFilename.dylib" />
 </configuration>
 "@
diff --git a/build.libgit2.sh b/build.libgit2.sh
index 85f4c65c..585976fa 100755
--- a/build.libgit2.sh
+++ b/build.libgit2.sh
@@ -34,6 +34,8 @@ PACKAGEPATH="nuget.package/runtimes"
 if [[ $RID == "" ]]; then
 	if [[ $ARCH == "x86_64" ]]; then
 		RID="unix-x64"
+	elif [[ $ARCH == "aarch64" ]]; then
+		RID="unix-arm64"
 	else
 		RID="unix-x86"
 	fi