diff --git a/riot/.gitignore b/riot/.gitignore
new file mode 100644
index 0000000000..ce36d3b374
--- /dev/null
+++ b/riot/.gitignore
@@ -0,0 +1 @@
+riot-web
\ No newline at end of file
diff --git a/riot/install.sh b/riot/install.sh
new file mode 100644
index 0000000000..3729c3c03a
--- /dev/null
+++ b/riot/install.sh
@@ -0,0 +1,8 @@
+RIOT_BRANCH=master
+curl -L https://github.com/vector-im/riot-web/archive/${RIOT_BRANCH}.zip --output riot.zip
+unzip riot.zip
+rm riot.zip
+mv riot-web-${RIOT_BRANCH} riot-web
+pushd riot-web
+npm install
+npm run build
diff --git a/riot/start.sh b/riot/start.sh
new file mode 100644
index 0000000000..6e9ad218e1
--- /dev/null
+++ b/riot/start.sh
@@ -0,0 +1,5 @@
+pushd riot-web/webapp/
+python -m SimpleHTTPServer 8080 &
+PID=$!
+popd
+echo $PID > riot.pid
\ No newline at end of file
diff --git a/riot/stop.sh b/riot/stop.sh
new file mode 100644
index 0000000000..d0a0d69502
--- /dev/null
+++ b/riot/stop.sh
@@ -0,0 +1,3 @@
+PIDFILE=riot.pid
+kill $(cat $PIDFILE)
+rm $PIDFILE
\ No newline at end of file