diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 4.0.18
+
++ The return values of [`backForwardListGetNthItem`](https://hackage.haskell.org/package/gi-webkit2/docs/GI-WebKit2-Objects-BackForwardList.html#v:backForwardListGetNthItem), [`backForwardListGetBackItem`](https://hackage.haskell.org/package/gi-webkit2/docs/GI-WebKit2-Objects-BackForwardList.html#v:backForwardListGetBackItem), [`backForwardListGetForwardItem`](https://hackage.haskell.org/package/gi-webkit2/docs/GI-WebKit2-Objects-BackForwardList.html#v:backForwardListGetForwardItem) and [`backForwardListGetCurrentItem`](https://hackage.haskell.org/package/gi-webkit2/docs/GI-WebKit2-Objects-BackForwardList.html#v:backForwardListGetCurrentItem) can all be `NULL`, but were not marked as such. This fixes [issue 155](https://github.com/haskell-gi/haskell-gi/issues/155).
+
 ### 4.0.17
 
 + The `ignoreHosts` argument of [`networkProxySettingsNew`](https://hackage.haskell.org/package/gi-webkit2/docs/GI-WebKit2-Structs-NetworkProxySettings.html#v:networkProxySettingsNew) was being represented as `Maybe Text`, but it should have been `Maybe [Text]`. This fixes [issue 154](https://github.com/haskell-gi/haskell-gi/issues/154).
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Documentation
 Autogenerated documentation for this package can be found at
 
-[https://hackage.haskell.org/package/gi-webkit2-4.0.17/docs/GI-WebKit2.html](https://hackage.haskell.org/package/gi-webkit2-4.0.17/docs/GI-WebKit2.html)
+[https://hackage.haskell.org/package/gi-webkit2-4.0.18/docs/GI-WebKit2.html](https://hackage.haskell.org/package/gi-webkit2-4.0.18/docs/GI-WebKit2.html)
 
 For general documentation on using [haskell-gi](https://github.com/haskell-gi/haskell-gi) based bindings, see [the project page](https://github.com/haskell-gi/haskell-gi) or [the Wiki](https://github.com/haskell-gi/haskell-gi/wiki).
diff --git a/WebKit2.overrides b/WebKit2.overrides
--- a/WebKit2.overrides
+++ b/WebKit2.overrides
@@ -11,3 +11,10 @@
 set-attr WebKit2/NetworkProxySettings/new/@parameters/ignore_hosts/@array c:type gchar**
 set-attr WebKit2/NetworkProxySettings/new/@parameters/ignore_hosts/@array/@type name utf8
 set-attr WebKit2/NetworkProxySettings/new/@parameters/ignore_hosts/@array/@type c:type gchar**
+
+# https://github.com/haskell-gi/haskell-gi/issues/155
+# Even get_current_item can return null if no page has ever been loaded
+set-attr WebKit2/BackForwardList/get_current_item/@return-value nullable 1
+set-attr WebKit2/BackForwardList/get_back_item/@return-value nullable 1
+set-attr WebKit2/BackForwardList/get_forward_item/@return-value nullable 1
+set-attr WebKit2/BackForwardList/get_nth_item/@return-value nullable 1
diff --git a/gi-webkit2.cabal b/gi-webkit2.cabal
--- a/gi-webkit2.cabal
+++ b/gi-webkit2.cabal
@@ -1,5 +1,5 @@
 name:                 gi-webkit2
-version:              4.0.17
+version:              4.0.18
 synopsis:             WebKit2 bindings
 description:          Bindings for WebKit2, autogenerated by haskell-gi.
 homepage:             https://github.com/haskell-gi/haskell-gi