diff --git a/sys/rpicamsrc/RaspiCapture.h b/sys/rpicamsrc/RaspiCapture.h
index 053ae1c03a..571d3b7fc1 100644
--- a/sys/rpicamsrc/RaspiCapture.h
+++ b/sys/rpicamsrc/RaspiCapture.h
@@ -54,6 +54,8 @@
 #include "RaspiCamControl.h"
 #include "RaspiPreview.h"
 
+#define RPICAMSRC_MAX_FPS 1000
+
 GST_DEBUG_CATEGORY_EXTERN (gst_rpi_cam_src_debug);
 #define GST_CAT_DEFAULT gst_rpi_cam_src_debug
 
diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c
index 7cd369e80c..5b2532d609 100644
--- a/sys/rpicamsrc/gstrpicamsrc.c
+++ b/sys/rpicamsrc/gstrpicamsrc.c
@@ -1285,12 +1285,12 @@ gst_rpi_cam_src_get_caps (GstBaseSrc * bsrc, GstCaps * filter)
     if (gst_structure_has_name (s, "video/x-h264")) {
        gst_caps_set_simple (caps, "width", GST_TYPE_INT_RANGE, 1, 1920, "height",
            GST_TYPE_INT_RANGE, 1, 1080, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
-           90, 1, NULL);
+           RPICAMSRC_MAX_FPS, 1, NULL);
     }
     else {
        gst_caps_set_simple (caps, "width", GST_TYPE_INT_RANGE, 1, 3240, "height",
            GST_TYPE_INT_RANGE, 1, 2464, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
-           90, 1, NULL);
+           RPICAMSRC_MAX_FPS, 1, NULL);
     }
   }
 done:
diff --git a/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c b/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
index 387ee61c27..ff80832275 100644
--- a/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
+++ b/sys/rpicamsrc/gstrpicamsrcdeviceprovider.c
@@ -120,7 +120,7 @@ gst_rpi_cam_src_device_new (void)
   s = gst_structure_new ("video/x-h264",
       "width", GST_TYPE_INT_RANGE, 1, 1920,
       "height", GST_TYPE_INT_RANGE, 1, 1080,
-      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, 90, 1,
+      "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, RPICAMSRC_MAX_FPS, 1,
       "stream-format", G_TYPE_STRING, "byte-stream",
       "alignment", G_TYPE_STRING, "au",
       NULL);