diff --git a/snapcraft/Makefile.am b/snapcraft/Makefile.am
index 15813be72f..8cc4e0b4c6 100644
--- a/snapcraft/Makefile.am
+++ b/snapcraft/Makefile.am
@@ -1,11 +1,5 @@
 EXTRA_DIST = snapcraft.yaml \
-   scripts/Makefile scripts/zebra-service scripts/bgpd-service \
-   scripts/isisd-service scripts/ripd-service scripts/ripngd-service \
-   scripts/ospf6d-service scripts/ospfd-service \
-   scripts/isisd-service scripts/pimd-service \
-   scripts/ldpd-service \
-   defaults/bgpd.conf.default defaults/isisd.conf.default \
-   defaults/ospf6d.conf.default defaults/ospfd.conf.default \
-   defaults/pimd.conf.default defaults/zebra.conf.default \
-   defaults/ripd.conf.default defaults/ripngd.conf.default \
-   defaults/ldpd.conf.default defaults/vtysh.conf.default
+   README.* \
+   scripts/Makefile scripts/*-service \
+   defaults/*.conf.default \
+   helpers snap
diff --git a/snapcraft/setup/gui/icon.png b/snapcraft/snap/gui/icon.png
similarity index 100%
rename from snapcraft/setup/gui/icon.png
rename to snapcraft/snap/gui/icon.png