diff --git a/Makefile b/Makefile
index 67d26a71b74..b1bd3f216a0 100644
--- a/Makefile
+++ b/Makefile
@@ -375,6 +375,10 @@ gen: actors-gen type-gen method-gen docsgen api-gen
 	@echo ">>> IF YOU'VE MODIFIED THE CLI, REMEMBER TO ALSO MAKE docsgen-cli"
 .PHONY: gen
 
+snap: lotus lotus-miner lotus-worker
+	snapcraft
+	# snapcraft upload ./lotus_*.snap
+
 # separate from gen because it needs binaries
 docsgen-cli: lotus lotus-miner lotus-worker
 	python ./scripts/generate-lotus-cli.py
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
new file mode 100644
index 00000000000..7cdc1746d3b
--- /dev/null
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,28 @@
+name: lotus
+base: core18
+version: '1.8.0'
+summary: filecoin daemon/client
+description: |
+  Filecoin is a peer-to-peer network that stores files on the internet
+  with built-in economic incentives to ensure files are stored reliably over time
+grade: devel
+confinement: devmode # use 'strict' once you have the right plugs and slots
+
+parts:
+  libs:
+    plugin: dump
+    source: ./
+    organize:
+      'lotus' : bin/
+      'lotus-*' : bin/
+    stage-packages:
+      - ocl-icd-libopencl1
+      - libhwloc1
+      - libgcc1
+apps:
+  lotus:
+    command: bin/lotus
+  lotus-miner:
+    command: bin/lotus-miner
+  lotus-worker:
+    command: bin/lotus-worker