diff --git a/stage1/00-boot-files/files/config.txt b/stage1/00-boot-files/files/config.txt
index 06364c5..9a1e756 100644
--- a/stage1/00-boot-files/files/config.txt
+++ b/stage1/00-boot-files/files/config.txt
@@ -54,3 +54,8 @@
 
 # Enable audio (loads snd_bcm2835)
 dtparam=audio=on
+
+# Enable camera
+start_x=1
+gpu_mem=128
+disable_camera_led=1
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index b7a2d95..309628d 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -11,6 +11,9 @@ install -m 644 files/console-setup   	"${ROOTFS_DIR}/etc/default/"
 
 install -m 755 files/rc.local		"${ROOTFS_DIR}/etc/"
 
+# enable pi camera
+install -m 644 files/picamera.conf	"${ROOTFS_DIR}/etc/modules-load.d/"
+
 # disable wireless
 install -m 644 files/raspi-blacklist.conf "${ROOTFS_DIR}/etc/modprobe.d/"
 
diff --git a/stage2/01-sys-tweaks/files/picamera.conf b/stage2/01-sys-tweaks/files/picamera.conf
new file mode 100644
index 0000000..ab20510
--- /dev/null
+++ b/stage2/01-sys-tweaks/files/picamera.conf
@@ -0,0 +1 @@
+bcm2835_v4l2