diff --git a/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp b/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp
new file mode 100644
index 000000000000..07dc70d35c8d
--- /dev/null
+++ b/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp
@@ -0,0 +1,15 @@
+--- libs/indibase/dsp/dspinterface.cpp.orig	2022-05-21 13:52:23 UTC
++++ libs/indibase/dsp/dspinterface.cpp
+@@ -336,9 +336,9 @@ dsp_stream_p Interface::loadFITS(char* buffer, int len
+     long ndims;
+     long bits_per_sample;
+     int status;
+-    off_t offset;
+-    off_t head;
+-    off_t end;
++    OFF_T offset;
++    OFF_T head;
++    OFF_T end;
+     fitsfile *fptr;
+     void* buf;
+     char error_status[MAXINDINAME];
diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp
new file mode 100644
index 000000000000..88fb1d26d317
--- /dev/null
+++ b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp
@@ -0,0 +1,22 @@
+--- libs/indibase/property/indipropertybasic.cpp.orig	2022-05-21 13:52:23 UTC
++++ libs/indibase/property/indipropertybasic.cpp
+@@ -16,6 +16,7 @@
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+ 
++#include <cassert>
+ #include "indipropertybasic.h"
+ #include "indipropertybasic_p.h"
+ 
+@@ -342,9 +343,10 @@ const WidgetView<T> *PropertyBasic<T>::at(size_t index
+ }
+ 
+ template <typename T>
+-WidgetView<T> &PropertyBasic<T>::operator[](size_t index) const
++WidgetView<T> &PropertyBasic<T>::operator[](ssize_t index) const
+ {
+     D_PTR(const PropertyBasic);
++    assert(index >= 0);
+     return *d->property.at(index);
+ }
+ 
diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h
new file mode 100644
index 000000000000..383a82ef1277
--- /dev/null
+++ b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h
@@ -0,0 +1,11 @@
+--- libs/indibase/property/indipropertybasic.h.orig	2022-05-21 13:52:23 UTC
++++ libs/indibase/property/indipropertybasic.h
+@@ -110,7 +110,7 @@ class PropertyBasic : public INDI::Property (public)
+ 
+     const WidgetView<T> *at(size_t index) const;
+ 
+-    WidgetView<T> &operator[](size_t index) const;
++    WidgetView<T> &operator[](ssize_t index) const;
+ 
+ public: // STL-style iterators
+     WidgetView<T> *begin();