diff --git a/ocaml-lablgtk-vadjustment.patch b/ocaml-lablgtk-vadjustment.patch
new file mode 100644
index 0000000..5c37925
--- /dev/null
+++ b/ocaml-lablgtk-vadjustment.patch
@@ -0,0 +1,12 @@
+https://github.com/garrigue/lablgtk/commit/034d4fbb1f09431048dd4231bf2ba9c69db59e6a
+--- a/src/gPack.ml	2020-06-19 09:37:39.000000000 -0600
++++ b/src/gPack.ml	2021-06-18 14:15:02.993282607 -0600
+@@ -134,7 +134,7 @@ end
+ let layout ?hadjustment ?vadjustment ?layout_width ?layout_height =
+   Layout.make_params []
+     ?hadjustment:(may_map GData.as_adjustment hadjustment)
+-    ?vadjustment:(may_map GData.as_adjustment hadjustment)
++    ?vadjustment:(may_map GData.as_adjustment vadjustment)
+     ?width:layout_width ?height:layout_height ~cont:(
+   pack_container ~create:(fun p -> new layout (Layout.create p)))
+ 
diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec
index 5e03290..8ebd382 100644
--- a/ocaml-lablgtk.spec
+++ b/ocaml-lablgtk.spec
@@ -1,6 +1,6 @@
 Name:           ocaml-lablgtk
 Version:        2.18.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -8,6 +8,8 @@ License:        LGPLv2 with exceptions
 
 URL:            http://lablgtk.forge.ocamlcore.org/
 Source:         https://github.com/garrigue/lablgtk/archive/%{version}/lablgtk-%{version}.tar.gz
+# Upstream patch to fix hadjustment/vadjustment mixup
+Patch0:         %{name}-vadjustment.patch
 
 BuildRequires:  help2man
 BuildRequires:  make
@@ -19,7 +21,6 @@ BuildRequires:  pkgconfig(gtksourceview-2.0)
 BuildRequires:  pkgconfig(gtkspell-2.0)
 BuildRequires:  pkgconfig(libglade-2.0)
 BuildRequires:  pkgconfig(libgnomecanvas-2.0)
-BuildRequires:  pkgconfig(libgnomeui-2.0)
 BuildRequires:  pkgconfig(librsvg-2.0)
 BuildRequires:  pkgconfig(ncurses)
 BuildRequires:  pkgconfig(xmu)
@@ -56,7 +57,7 @@ chmod a-x README*
 %build
 # Parallel builds don't work.
 unset MAKEFLAGS
-%configure --enable-debug
+%configure --enable-debug --without-gnomeui
 sed -e "s|-O|$RPM_OPT_FLAGS|" \
     -e "s|-shared|& -ccopt \"$RPM_LD_FLAGS\"|" \
     -e "s|(CAMLMKLIB)|& -ldopt \"$RPM_LD_FLAGS\"|" \
@@ -154,6 +155,10 @@ done
 
 
 %changelog
+* Tue Jun 22 2021 Jerry James <loganjerry@gmail.com> - 2.18.11-7
+- Drop gnomeui support due to upcoming retirement
+- Add -vadjustment patch to fix layout issue
+
 * Mon Mar  1 10:09:47 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.18.11-6
 - OCaml 4.12.0 build