diff --git a/.circleci/config.yml b/.circleci/config.yml
index eaedf7d..05e221d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,6 +164,26 @@ jobs:
       - save_cache:
           key: linux-armv7-assets-{{ .Revision }}
           paths: ~/docker/linux-armv7.tar
+  linux-armv7a:
+    <<: *build-settings
+    steps:
+      - restore_cache:
+          key: base-assets-{{ .Revision }}
+      - run:
+         name: linux-armv7a build
+         no_output_timeout: 1.5h
+         command: |
+           docker load -i ~/docker/base.tar
+           make linux-armv7a
+           tagged=$(docker images -q -f 'since=dockcross/linux-armv7a:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv7a)
+           docker save -o ~/docker/linux-armv7a.tar dockcross/linux-armv7a:latest $tagged
+      - run:
+         name: linux-armv7a test
+         command: |
+           make linux-armv7a.test
+      - save_cache:
+          key: linux-armv7a-assets-{{ .Revision }}
+          paths: ~/docker/linux-armv7a.tar
   linux-mipsel:
     <<: *build-settings
     steps:
@@ -523,6 +543,18 @@ jobs:
               tagged=$(docker images -q -f 'since=dockcross/linux-armv7:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv7)
               docker push $tagged
             fi
+      - restore_cache:
+          key: linux-armv7a-assets-{{ .Revision }}
+      - deploy:
+          name: Deploy linux-armv7a
+          command: |
+            docker load -i ~/docker/linux-armv7a.tar
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
+              docker push dockcross/linux-armv7a:latest
+              tagged=$(docker images -q -f 'since=dockcross/linux-armv7a:latest' --format '{{.Repository}}:{{.Tag}}' | grep linux-armv7a)
+              docker push $tagged
+            fi
       # Image build currently broken. See #209
       #- restore_cache:
           #key: linux-mipsel-assets-{{ .Revision }}
@@ -708,6 +740,9 @@ workflows:
         - linux-armv7:
             requires:
               - base
+        - linux-armv7a:
+            requires:
+              - base
         # Image build currently broken. See #209
         #- linux-mipsel:
             #requires:
@@ -759,6 +794,7 @@ workflows:
               - linux-armv5
               - linux-armv6
               - linux-armv7
+              - linux-armv7a
               #- linux-mipsel
               - linux-s390x
               # Image build currently broken. See #209