diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index f9ac33b..fe77ab4 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -147,6 +147,12 @@ apt-get  -o Dpkg::Options::=--force-confdef \
   pi-bluetooth \
   lsb-release \
   gettext \
+  unzip \
+  zip \
+  libav-tools \
+  gstreamer1.0-tools \
+  motion \
+  gpac \
   cloud-init
 
 
@@ -209,6 +215,14 @@ echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
 chmod +x usr/local/bin/rpi-serial-console
 
+echo "Installing RPi Cam Web Interface"
+wget -q https://github.com/silvanmelchior/RPi_Cam_Web_Interface/archive/master.zip -O /tmp/rpicam.zip
+cd /tmp/
+unzip rpicam.zip
+cd RPi_Cam_Web_Interface-master
+cp /etc/rpicam_config.txt config.txt
+bash ./install.sh q
+
 # fix eth0 interface name
 ln -s /dev/null /etc/systemd/network/99-default.link
 
diff --git a/builder/files/etc/rc.local b/builder/files/etc/rc.local
new file mode 100755
index 0000000..65634df
--- /dev/null
+++ b/builder/files/etc/rc.local
@@ -0,0 +1,14 @@
+#!/bin/sh -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+exit 0
diff --git a/builder/files/etc/rpicam_config.txt b/builder/files/etc/rpicam_config.txt
new file mode 100644
index 0000000..325c3f4
--- /dev/null
+++ b/builder/files/etc/rpicam_config.txt
@@ -0,0 +1,8 @@
+rpicamdir="cam"
+webserver=""
+webport="80"
+user=""
+webpasswd=""
+autostart="yes"
+jpglink="no"
+phpversion="7"
diff --git a/builder/files/var/www/index.html b/builder/files/var/www/index.html
index 2dc1ada..c7b96e2 100644
--- a/builder/files/var/www/index.html
+++ b/builder/files/var/www/index.html
@@ -5,6 +5,12 @@
         text-align: center;
         font-family: sans;
       }
+      .btn {
+        padding:10px;
+        background:#428bca;
+        color:white;
+        font-weight:bold;
+      }
     </style>
   </head>
   <body>
@@ -18,5 +24,7 @@ <h2>Public Lab Pi Camera Kit</h2>
     <p><i>You've correctly connected to your Pi!</i></p>
     <p>If you're seeing this in a pop-up, close it and open <a href="http://pi.local">http://pi.local</a> in a browser.</p>
 
+    <p class="btn"><a href="/cam">View Camera</a></p>
+
   </body>
 </html>
