diff --git a/WATCHLISTS b/WATCHLISTS
index 5acc68da8..109dacc96 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -17,27 +17,46 @@
     'video_engine': {
       'filepath': 'src/video_engine/.*',
     },
+    'voice_engine': {
+      'filepath': 'src/voice_engine/.*',
+    },
     'video_capture': {
       'filepath': 'src/modules/video_capture/.*',
     },
     'video_render': {
       'filepath': 'src/modules/video_render/.*',
     },
+    'audio_device': {
+      'filepath': 'src/modules/audio_device/.*',
+    },
     'NetEQ': {
       'filepath': 'src/modules/audio_coding/NetEQ/.*',
     },
     'video_codecs': {
       'filepath': 'src/modules/video_coding/codecs/.*',
     },
+    'rtp_rtcp': {
+      'filepath': 'src/modules/rtp_rtcp/.*'
+    },
+    'system_wrappers': {
+      'filepath': 'src/system_wrappers/.*',
+    },
   },
 
   'WATCHLISTS': {
     'this_file': [''],
     'video_engine': ['mflodman@webrtc.org',
                      'perkj@webrtc.org'],
-    'video_capture': ['mflodman@webrtc.org'],
-    'video_render': ['mflodman@webrtc.org'],
+    'voice_engine': ['henrika@webrtc.org'],
+    'video_capture': ['mflodman@webrtc.org',
+                      'perkj@webrtc.org'],
+    'video_render': ['mflodman@webrtc.org',
+                     'perkj@webrtc.org'],
+    'audio_device': ['henrika@webrtc.org'],
     'NetEQ': ['henrik.lundin@webrtc.org'],
     'video_codecs': ['henrik.lundin@webrtc.org'],
+    'rtp_rtcp': ['mflodman@webrtc.org'],
+    'system_wrappers': ['mflodman@webrtc.org',
+                        'henrika@webrtc.org' ],
   },
 }