diff --git a/avi_r/reader.py b/avi_r/reader.py
index 1fa8aac..ac5112b 100644
--- a/avi_r/reader.py
+++ b/avi_r/reader.py
@@ -230,7 +230,8 @@ def __del__(self):
             self._del()
 
     def _init(self, video_stream_id=0):
-        self._container = av.open(self.path, metadata_errors='ignore')
+        self._container = av.open(
+            self.path, metadata_errors='replace', timeout=60)
         self._stream = self._container.streams.video[video_stream_id]
         self._frame_gen = self._get_frame_gen()
         self.reorder_buffer = []
diff --git a/docs/version.md b/docs/version.md
index 66947cf..ce90ff1 100644
--- a/docs/version.md
+++ b/docs/version.md
@@ -1,5 +1,9 @@
 # Version History
 
+## AVI-R v1.3.6
+
+* Add timeout for PyAV.
+
 ## AVI-R v1.3.5
 
 * More robust extraction of frame size.
diff --git a/setup.py b/setup.py
index 343064f..6fd2637 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name='avi-r',
-    version='1.3.5',
+    version='1.3.6',
     author='Lijun Yu',
     author_email='lijun@lj-y.com',
     description='A robust reader for avi videos.',