diff --git a/GstBase.overrides b/GstBase.overrides
new file mode 100644
--- /dev/null
+++ b/GstBase.overrides
@@ -0,0 +1,56 @@
+namespace GstBase
+
+# Generated from gstreamer-base 1.8.0 with xsltproc Nullable.xslt GstBase-1.0.gir
+set-attr GstBase/Adapter/get_buffer/@return-value nullable 1
+set-attr GstBase/Adapter/get_buffer_fast/@return-value nullable 1
+set-attr GstBase/Adapter/get_buffer_list/@return-value nullable 1
+set-attr GstBase/Adapter/get_list/@return-value nullable 1
+set-attr GstBase/Adapter/map/@return-value nullable 1
+set-attr GstBase/Adapter/take/@return-value nullable 1
+set-attr GstBase/Adapter/take_buffer/@return-value nullable 1
+set-attr GstBase/Adapter/take_buffer_fast/@return-value nullable 1
+set-attr GstBase/Adapter/take_buffer_list/@return-value nullable 1
+set-attr GstBase/Adapter/take_list/@return-value nullable 1
+set-attr GstBase/BaseParse/merge_tags/@parameters/tags nullable 1
+set-attr GstBase/BaseSink/get_last_sample/@return-value nullable 1
+set-attr GstBase/CollectPads/add_pad/@return-value nullable 1
+set-attr GstBase/CollectPads/clip_running_time/@parameters/outbuf nullable 1
+set-attr GstBase/CollectPads/clip_running_time/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_buffer_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_clip_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_compare_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_event_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_flush_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPads/set_query_function/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsBufferFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsClipFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsCompareFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsEventFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsFlushFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsFunction/@parameters/user_data nullable 1
+set-attr GstBase/CollectPadsQueryFunction/@parameters/user_data nullable 1
+set-attr GstBase/DataQueue/new/@parameters/checkdata nullable 1
+set-attr GstBase/DataQueueCheckFullFunction/@parameters/checkdata nullable 1
+set-attr GstBase/DataQueueEmptyCallback/@parameters/checkdata nullable 1
+set-attr GstBase/DataQueueFullCallback/@parameters/checkdata nullable 1
+set-attr GstBase/QueueArray/drop_element/@return-value nullable 1
+set-attr GstBase/QueueArray/drop_struct/@parameters/p_struct nullable 1
+set-attr GstBase/QueueArray/find/@parameters/func nullable 1
+set-attr GstBase/QueueArray/find/@parameters/data nullable 1
+set-attr GstBase/QueueArray/peek_head/@return-value nullable 1
+set-attr GstBase/QueueArray/peek_head_struct/@return-value nullable 1
+set-attr GstBase/QueueArray/pop_head/@return-value nullable 1
+set-attr GstBase/QueueArray/pop_head_struct/@return-value nullable 1
+set-attr GstBase/QueueArray/push_tail/@parameters/data nullable 1
+set-attr GstBase/QueueArray/push_tail_struct/@parameters/p_struct nullable 1
+set-attr GstBase/TypeFindHelperGetRangeFunction/@parameters/parent nullable 1
+set-attr GstBase/type_find_helper/@return-value nullable 1
+set-attr GstBase/type_find_helper_for_buffer/@return-value nullable 1
+set-attr GstBase/type_find_helper_for_buffer/@parameters/obj nullable 1
+set-attr GstBase/type_find_helper_for_data/@return-value nullable 1
+set-attr GstBase/type_find_helper_for_data/@parameters/obj nullable 1
+set-attr GstBase/type_find_helper_for_extension/@return-value nullable 1
+set-attr GstBase/type_find_helper_for_extension/@parameters/obj nullable 1
+set-attr GstBase/type_find_helper_get_range/@return-value nullable 1
+set-attr GstBase/type_find_helper_get_range/@parameters/parent nullable 1
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -6,6 +6,6 @@
 main = setupHaskellGIBinding name version verbose overridesFile outputDir
   where name = "GstBase"
         version = "1.0"
-        overridesFile = Nothing
+        overridesFile = Just "GstBase.overrides"
         verbose = False
         outputDir = Nothing
diff --git a/gi-gstbase.cabal b/gi-gstbase.cabal
--- a/gi-gstbase.cabal
+++ b/gi-gstbase.cabal
@@ -1,5 +1,5 @@
 name:                 gi-gstbase
-version:              1.0.4
+version:              1.0.5
 synopsis:             GStreamerBase bindings
 description:          Bindings for GStreamerBase, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi
@@ -11,8 +11,11 @@
 build-type:           Custom
 cabal-version:        >= 1.24
 
+extra-source-files: GstBase.overrides
+
 custom-setup
       setup-depends: base >= 4.7 && < 5,
+                     Cabal >= 1.24,
                      haskell-gi >= 0.17.3 && < 1
 
 library