diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde
index 8b84b0b1c3..6510fa0a93 100644
--- a/ArduPlane/Log.pde
+++ b/ArduPlane/Log.pde
@@ -50,6 +50,7 @@ print_log_menu(void)
         PLOG(CURRENT);
         PLOG(COMPASS);
         PLOG(TECS);
+        PLOG(CAMERA);
  #undef PLOG
     }
 
@@ -139,6 +140,8 @@ select_logs(uint8_t argc, const Menu::arg *argv)
         TARG(CMD);
         TARG(CURRENT);
         TARG(COMPASS);
+        TARG(TECS);
+        TARG(CAMERA);
  #undef TARG
     }
 
diff --git a/ArduPlane/commands_logic.pde b/ArduPlane/commands_logic.pde
index d54b8ab146..2a5534f4d9 100644
--- a/ArduPlane/commands_logic.pde
+++ b/ArduPlane/commands_logic.pde
@@ -661,6 +661,8 @@ static void do_take_picture()
 {
 #if CAMERA == ENABLED
     camera.trigger_pic();
-    Log_Write_Camera();
+    if (g.log_bitmask & MASK_LOG_CAMERA) {
+        Log_Write_Camera();
+    }
 #endif
 }
diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index cc802c4fa3..7b6836d6c2 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -647,7 +647,8 @@
     MASK_LOG_CMD | \
     MASK_LOG_COMPASS | \
     MASK_LOG_CURRENT | \
-    MASK_LOG_TECS
+    MASK_LOG_TECS | \
+    MASK_LOG_CAMERA
 
 
 
diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h
index 83b851da0a..0ad21b94a6 100644
--- a/ArduPlane/defines.h
+++ b/ArduPlane/defines.h
@@ -173,6 +173,7 @@ enum log_messages {
 #define MASK_LOG_CURRENT                (1<<9)
 #define MASK_LOG_COMPASS                (1<<10)
 #define MASK_LOG_TECS                   (1<<11)
+#define MASK_LOG_CAMERA                 (1<<12)
 
 // Waypoint Modes
 // ----------------