diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 146ab6393..83eba4fed 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -37,13 +37,26 @@ apps:
 
 
 parts:
+  python-augeas:
+    plugin: python
+    source: git://github.com/basak/python-augeas
+    source-branch: snap
+    build-packages: [libaugeas-dev]
+    python-packages:
+      - wheel
+    stage:
+      - -pyvenv.cfg
+      - -**/__pycache__
+      - -bin
+      - -**/RECORD
+      - -**/wheel
+      - -lib64
   certbot:
     plugin: python
     source: .
     constraints: [$SNAPCRAFT_PART_SRC/snap-constraints.txt]
     python-packages:
       - wheel
-      - git+https://github.com/basak/python-augeas.git@snap
       - ./acme
       - ./certbot
       - ./certbot-apache
@@ -56,10 +69,11 @@ parts:
       - libaugeas0
       - python3-venv
     # To build cryptography and cffi if needed
-    build-packages: [libaugeas-dev, libffi-dev, libssl-dev]
+    build-packages: [libffi-dev, libssl-dev]
     override-pull: |
         snapcraftctl pull
         snapcraftctl set-version `cd $SNAPCRAFT_PART_SRC/certbot && git describe|sed s/^v//`
+    after: [python-augeas]
 
   wrappers:
     plugin: dump