diff --git a/raspi-config b/raspi-config
index 631f38e..78db954 100755
--- a/raspi-config
+++ b/raspi-config
@@ -433,12 +433,14 @@ set_camera() {
   [ -e /boot/config.txt ] || touch /boot/config.txt
 
   if [ "$1" -eq 0 ]; then # disable camera
-    set_config_var start_file start.elf /boot/config.txt
-    set_config_var fixup_file fixup.dat /boot/config.txt
+    set_config_var startx 0 /boot/config.txt
+    sed /boot/config.txt -i -e "s/^start_file/#start_file/"
+    sed /boot/config.txt -i -e "s/^fixup_file/#fixup_file/"
   else # enable camera
-    set_config_var start_file start_x.elf /boot/config.txt
-    set_config_var fixup_file fixup_x.dat /boot/config.txt
+    set_config_var startx 1 /boot/config.txt
     set_config_var gpu_mem 128 /boot/config.txt
+    sed /boot/config.txt -i -e "s/^start_file/#start_file/"
+    sed /boot/config.txt -i -e "s/^fixup_file/#fixup_file/"
   fi
 }