diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5ad221967..3f06598f7 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,7 +20,7 @@ adopt-info: certbot
 
 apps:
   certbot:
-    command: bin/certbot.wrapper
+    command: certbot.wrapper
     environment:
       PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
       AUGEAS_LENS_LIB: "$SNAP/usr/share/augeas/lenses/dist"
@@ -37,26 +37,13 @@ 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
@@ -69,7 +56,7 @@ parts:
       - libaugeas0
       - python3-venv
     # To build cryptography and cffi if needed
-    build-packages: [libffi-dev, libssl-dev]
+    build-packages: [libaugeas-dev, libffi-dev, libssl-dev]
     override-pull: |
         snapcraftctl pull
         snapcraftctl set-version `cd $SNAPCRAFT_PART_SRC/certbot && git describe|sed s/^v//`