diff --git a/flumotion/component/encoders/x264/x264.py b/flumotion/component/encoders/x264/x264.py
index ecaeba8..2d60399 100644
--- a/flumotion/component/encoders/x264/x264.py
+++ b/flumotion/component/encoders/x264/x264.py
@@ -41,3 +41,5 @@ class X264(feedcomponent.EncoderComponent):
                properties['keyframe-maxdistance'])
         if 'option-string' in properties:
             element.set_property('option-string', properties['option-string'])
+        if 'byte-stream' in properties:
+            element.set_property('byte-stream', properties['byte-stream'])
diff --git a/flumotion/component/encoders/x264/x264.xml b/flumotion/component/encoders/x264/x264.xml
index cc44d3a..b31caa1 100644
--- a/flumotion/component/encoders/x264/x264.xml
+++ b/flumotion/component/encoders/x264/x264.xml
@@ -27,6 +27,8 @@
                   _description="Custom parameters to pass to x264 encoder." />
         <property name="quality" type="int"
                   _description="Speed/quality tradeoff." />
+        <property name="byte-stream" type="bool"
+                  _description="Generate byte stream format of NALU" />
       </properties>

     </component>