diff --git a/certbot.wrapper b/certbot.wrapper
new file mode 100755
index 000000000..f99b25d81
--- /dev/null
+++ b/certbot.wrapper
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec certbot "$@"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d0a8adba8..7076f7e18 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -20,13 +20,13 @@ adopt-info: certbot
 
 apps:
   certbot:
-    command: bin/certbot
+    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"
       CERTBOT_SNAPPED: "True"
   renew:
-    command: bin/certbot -q renew
+    command: certbot.wrapper -q renew
     daemon: oneshot
     environment:
       PATH: "$SNAP/bin:$SNAP/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
@@ -81,6 +81,10 @@ parts:
         cd $SNAPCRAFT_PART_SRC
         python3 tools/strip_hashes.py letsencrypt-auto-source/pieces/dependency-requirements.txt | grep -v python-augeas > snap-constraints.txt
         snapcraftctl set-version `git describe|sed s/^v//`
+  wrappers:
+    plugin: dump
+    source: .
+    stage: [certbot.wrapper]
   shared-metadata:
     plugin: dump
     source: .