diff --git a/Makefile b/Makefile
index 4273b87d2..c9a6b4cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ CSS=$(wildcard *.css)
 CSS=$(subst .tiny,,$(shell find themes -type f -name '*.css'))
 COMPRESSED_CSS := $(patsubst %.css,%.tiny.css,$(CSS))
 PWD=`pwd`
+BUILDDIR=vendor
 
 # hosting variables
 SLEEP_TIME=300
@@ -29,6 +30,8 @@ install: default
 		$(DESTDIR)/usr/share/doc/plinth $(DESTDIR)/usr/share/man/man1
 	cp -a static themes $(DESTDIR)$(DATADIR)/
 	cp -a *.py modules templates $(DESTDIR)$(PYDIR)/
+	mkdir -p $(DESTDIR)$(PYDIR)/exmachina
+	cp -a vendor/exmachina/exmachina.py $(DESTDIR)$(PYDIR)/exmachina/.
 	cp share/init.d/plinth $(DESTDIR)/etc/init.d
 	install plinth $(DESTDIR)/usr/bin/
 	mkdir -p $(DESTDIR)/var/lib/plinth/cherrypy_sessions $(DESTDIR)/var/log/plinth $(DESTDIR)/var/run
diff --git a/plinth.py b/plinth.py
index b140dbcb0..e2bd80818 100755
--- a/plinth.py
+++ b/plinth.py
@@ -114,7 +114,7 @@ def setup():
       pass
 
    try:
-      from exmachina import ExMachinaClient
+      from vendor.exmachina.exmachina import ExMachinaClient
    except ImportError:
       cfg.exmachina = None
       print "unable to import exmachina client library, but continuing anyways..."
diff --git a/start.sh b/start.sh
index 8e141fcf8..8b97c0bcd 100755
--- a/start.sh
+++ b/start.sh
@@ -5,6 +5,6 @@
 export PYTHONPATH
 
 sudo killall exmachina.py
-sudo /usr/share/pyshared/exmachina/exmachina.py -v &
+sudo vendor/exmachina/exmachina.py -v &
 python plinth.py
 sudo killall exmachina.py
diff --git a/test.sh b/test.sh
index 4b6f701d4..535f6d408 100755
--- a/test.sh
+++ b/test.sh
@@ -1,6 +1,5 @@
 #! /bin/sh
 
-PYTHONPATH=build/exmachina:$PYTHONPATH
 PYTHONPATH=modules/installed/lib:$PYTHONPATH
 PYTHONPATH=vendor:$PYTHONPATH