diff --git a/protos/message.proto b/protos/message.proto
index 55b5650..6507bf2 100644
--- a/protos/message.proto
+++ b/protos/message.proto
@@ -62,6 +62,8 @@ message FileTransfer {
   bool show_hidden = 2;
 }
 
+message ViewCamera {}
+
 message OSLogin {
   string username = 1;
   string password = 2;
@@ -76,6 +78,7 @@ message LoginRequest {
   oneof union {
     FileTransfer file_transfer = 7;
     PortForward port_forward = 8;
+    ViewCamera view_camera = 9;
   }
   bool video_ack_required = 9;
   uint64 session_id = 10;
@@ -603,6 +606,7 @@ message PermissionInfo {
     Restart = 5;
     Recording = 6;
     BlockInput = 7;
+    Camera = 8;
   }
 
   Permission permission = 1;
@@ -660,6 +664,7 @@ message OptionMessage {
   // starting from 15 please, do not use removed fields
   BoolOption follow_remote_cursor = 15;
   BoolOption follow_remote_window = 16;
+  BoolOption disable_camera = 17;
 }
 
 message TestDelay {
diff --git a/protos/rendezvous.proto b/protos/rendezvous.proto
index 2fc0d90..b9b8ed7 100644
--- a/protos/rendezvous.proto
+++ b/protos/rendezvous.proto
@@ -11,6 +11,7 @@ enum ConnType {
   FILE_TRANSFER = 1;
   PORT_FORWARD = 2;
   RDP = 3;
+  VIEW_CAMERA = 4;
 }
 
 message RegisterPeerResponse { bool request_pk = 2; }
diff --git a/src/config.rs b/src/config.rs
index ce4e89d..7e29120 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2212,6 +2212,7 @@ pub mod keys {
     pub const OPTION_ENABLE_KEYBOARD: &str = "enable-keyboard";
     pub const OPTION_ENABLE_CLIPBOARD: &str = "enable-clipboard";
     pub const OPTION_ENABLE_FILE_TRANSFER: &str = "enable-file-transfer";
+    pub const OPTION_ENABLE_CAMERA: &str = "enable-camera";
     pub const OPTION_ENABLE_AUDIO: &str = "enable-audio";
     pub const OPTION_ENABLE_TUNNEL: &str = "enable-tunnel";
     pub const OPTION_ENABLE_REMOTE_RESTART: &str = "enable-remote-restart";
@@ -2362,6 +2363,7 @@ pub mod keys {
         OPTION_ENABLE_KEYBOARD,
         OPTION_ENABLE_CLIPBOARD,
         OPTION_ENABLE_FILE_TRANSFER,
+        OPTION_ENABLE_CAMERA,
         OPTION_ENABLE_AUDIO,
         OPTION_ENABLE_TUNNEL,
         OPTION_ENABLE_REMOTE_RESTART,