diff --git a/tensorflow/contrib/ffmpeg/__init__.py b/tensorflow/contrib/ffmpeg/__init__.py
index 348464a879e..7014d169842 100644
--- a/tensorflow/contrib/ffmpeg/__init__.py
+++ b/tensorflow/contrib/ffmpeg/__init__.py
@@ -25,3 +25,8 @@ from __future__ import print_function
 
 from tensorflow.contrib.ffmpeg.ffmpeg_ops import decode_audio
 from tensorflow.contrib.ffmpeg.ffmpeg_ops import encode_audio
+
+from tensorflow.python.util.all_util import remove_undocumented
+
+_allowed_symbols = ['decode_audio', 'encode_audio']
+remove_undocumented(__name__, _allowed_symbols)
diff --git a/tensorflow/tools/docs/BUILD b/tensorflow/tools/docs/BUILD
index e6050ed99b1..a3829482d29 100644
--- a/tensorflow/tools/docs/BUILD
+++ b/tensorflow/tools/docs/BUILD
@@ -68,6 +68,7 @@ py_binary(
         ":parser",
         ":py_guide_parser",
         "//tensorflow:tensorflow_py",
+        "//tensorflow/contrib/ffmpeg:ffmpeg_ops_py",
         "//tensorflow/python/debug:debug_py",
         "//tensorflow/tools/common:public_api",
         "//tensorflow/tools/common:traverse",
diff --git a/tensorflow/tools/docs/generate.py b/tensorflow/tools/docs/generate.py
index dfdbc748595..79acf05caa4 100644
--- a/tensorflow/tools/docs/generate.py
+++ b/tensorflow/tools/docs/generate.py
@@ -154,6 +154,7 @@ def extract():
           'stochastic_variables', 'variational_inference'
       ],
       'contrib.distributions': ['bijector'],
+      'contrib.ffmpeg': ['ffmpeg_ops'],
       'contrib.graph_editor': [
           'edit',
           'match',