W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/bttv/
+F:     Documentation/media/v4l-drivers/bttv*
 F:     drivers/media/pci/bt8xx/bttv*
 
 BUSLOGIC SCSI DRIVER
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/video4linux/cafe_ccic
+F:     Documentation/media/v4l-drivers/cafe_ccic*
 F:     drivers/media/platform/marvell-ccic/
 
 CAIF NETWORK LAYER
 W:     http://linuxtv.org
 S:     Supported
 F:     Documentation/cec.txt
-F:     Documentation/DocBook/media/v4l/cec*
+F:     Documentation/media/uapi/cec
 F:     drivers/staging/media/cec/
 F:     drivers/media/cec-edid.c
 F:     drivers/media/rc/keymaps/rc-cec.c
 W:     https://linuxtv.org
 W:     http://www.ivtvdriver.org/index.php/Cx18
 S:     Maintained
-F:     Documentation/video4linux/cx18.txt
+F:     Documentation/media/v4l-drivers/cx18*
 F:     drivers/media/pci/cx18/
 F:     include/uapi/linux/ivtv*
 
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/cx88/
+F:     Documentation/media/v4l-drivers/cx88*
 F:     drivers/media/pci/cx88/
 
 CXD2820R MEDIA DRIVER
 X:     Documentation/acpi
 X:     Documentation/power
 X:     Documentation/spi
-X:     Documentation/DocBook/media
+X:     Documentation/media
 T:     git git://git.lwn.net/linux.git docs-next
 
 DOUBLETALK DRIVER
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/usb/em28xx/
+F:     Documentation/media/v4l-drivers/em28xx*
 
 EMBEDDED LINUX
 M:     Paul Gortmaker <paul.gortmaker@windriver.com>
 T:     git git://linuxtv.org/media_tree.git
 W:     http://www.ivtvdriver.org
 S:     Maintained
-F:     Documentation/video4linux/*.ivtv
+F:     Documentation/media/v4l-drivers/ivtv*
 F:     drivers/media/pci/ivtv/
 F:     include/uapi/linux/ivtv*
 
 Q:     http://patchwork.kernel.org/project/linux-media/list/
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/dvb/
-F:     Documentation/video4linux/
-F:     Documentation/DocBook/media/
+F:     Documentation/media/
 F:     drivers/media/
 F:     drivers/staging/media/
 F:     include/linux/platform_data/media/
 MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER
 W:     http://popies.net/meye/
 S:     Orphan
-F:     Documentation/video4linux/meye.txt
+F:     Documentation/media/v4l-drivers/meye*
 F:     drivers/media/pci/meye/
 F:     include/uapi/linux/meye.h
 
 W:     http://www.isely.net/pvrusb2/
 T:     git git://linuxtv.org/media_tree.git
 S:     Maintained
-F:     Documentation/video4linux/README.pvrusb2
+F:     Documentation/media/v4l-drivers/pvrusb2*
 F:     drivers/media/usb/pvrusb2/
 
 PWC WEBCAM DRIVER
 W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
-F:     Documentation/video4linux/*.saa7134
+F:     Documentation/media/v4l-drivers/saa7134*
 F:     drivers/media/pci/saa7134/
 
 SAA7146 VIDEO4LINUX-2 DRIVER
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
 F:     drivers/media/usb/tm6000/
+F:     Documentation/media/v4l-drivers/tm6000*
 
 TW5864 VIDEO4LINUX DRIVER
 M:     Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 T:     git git://linuxtv.org/media_tree.git
 W:     http://royale.zerezo.com/zr364xx/
 S:     Maintained
-F:     Documentation/video4linux/zr364xx.txt
+F:     Documentation/media/v4l-drivers/zr364xx*
 F:     drivers/media/usb/zr364xx/
 
 ULPI BUS