diff --git a/Makefile b/Makefile
index 567373f..2f6f983 100644
--- a/Makefile
+++ b/Makefile
@@ -4,22 +4,24 @@ CFGDIR ?= configs/sc
 
 all: desktop
 
+YARN ?= yarnpkg
+
 
 -include release.mk
 
 
 web:
 	cp $(CFGDIR)/config.json element-web/
-	yarn --cwd element-web dist
+	$(YARN) --cwd element-web dist
 
 desktop-common: web
-	yarn --cwd element-desktop run fetch --cfgdir ''
-	yarn --cwd element-desktop run build:native
+	$(YARN) --cwd element-desktop run fetch --cfgdir ''
+	$(YARN) --cwd element-desktop run build:native
 
 desktop: windows linux
 
 linux: desktop-common
-	yarn --cwd element-desktop run build64linux
+	$(YARN) --cwd element-desktop run build64linux
 
 windows: desktop-common
-	yarn --cwd element-desktop run build64windows
+	$(YARN) --cwd element-desktop run build64windows
diff --git a/setup.sh b/setup.sh
index 1d2c1b4..c562219 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,28 +2,30 @@
 
 set -e
 
+yarn=yarnpkg
+
 pushd matrix-js-sdk
-yarn link
-yarn install
+$yarn link
+$yarn install
 popd
 
 pushd matrix-react-sdk
-yarn link matrix-js-sdk
-yarn link
-yarn install
+$yarn link matrix-js-sdk
+$yarn link
+$yarn install
 popd
 
 pushd element-web
-yarn link matrix-js-sdk
-yarn link matrix-react-sdk
-yarn link
-yarn install
+$yarn link matrix-js-sdk
+$yarn link matrix-react-sdk
+$yarn link
+$yarn install
 popd
 
 pushd element-desktop
-yarn link matrix-js-sdk
-yarn link matrix-react-sdk
-yarn link riot-web
-yarn install
+$yarn link matrix-js-sdk
+$yarn link matrix-react-sdk
+$yarn link riot-web
+$yarn install
 ln -s ../element-web/webapp ./ || true
 popd