diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index bf23ccb6e4..6575e4e733 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -544,6 +544,7 @@ ensure_profiles (GstVaapiDisplay * display)
         case GST_VAAPI_ENTRYPOINT_SLICE_ENCODE:
         case GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE:
         case GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP:
+        case GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI:
           g_array_append_val (priv->encoders, config);
           break;
       }
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c
index 6e8fd0a6a4..7148a83844 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.c
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.c
@@ -159,6 +159,9 @@ static const GstVaapiEntrypointMap gst_vaapi_entrypoints[] = {
 #endif
 #if VA_CHECK_VERSION(0,39,1)
   {GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP, VAEntrypointEncSliceLP},
+#endif
+#if USE_H264_FEI_ENCODER
+  {GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI, VAEntrypointFEI},
 #endif
   {0,}
 };
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.h b/gst-libs/gst/vaapi/gstvaapiprofile.h
index 745c229d26..1a6fbb81ba 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.h
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.h
@@ -190,6 +190,7 @@ typedef enum {
  * @GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE: Encode Picture
  * @GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP: Encode Slice low power/
  *                                        high performace varient
+ * @GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI: FEI Encode
  *
  * The set of all entrypoints for #GstVaapiEntrypoint
  */
@@ -199,7 +200,8 @@ typedef enum {
     GST_VAAPI_ENTRYPOINT_MOCO,
     GST_VAAPI_ENTRYPOINT_SLICE_ENCODE,
     GST_VAAPI_ENTRYPOINT_PICTURE_ENCODE,
-    GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP
+    GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_LP,
+    GST_VAAPI_ENTRYPOINT_SLICE_ENCODE_FEI
 } GstVaapiEntrypoint;
 
 const gchar *