diff --git a/virt-mem-0.3.1-bitstring2.patch b/virt-mem-0.3.1-bitstring2.patch
new file mode 100644
index 0000000..f95baf6
--- /dev/null
+++ b/virt-mem-0.3.1-bitstring2.patch
@@ -0,0 +1,14 @@
+--- virt-mem-0.3.1.orig/lib/virt_mem_dump.ml	2008-08-17 12:30:04.000000000 +0100
++++ virt-mem-0.3.1/lib/virt_mem_dump.ml	2008-12-05 19:50:27.000000000 +0000
+@@ -80,9 +80,9 @@
+ 
+   while !len > 0 do
+     let bits = min !len 8 in
+-    let byte, off', len' =
++    let byte =
+       Bitstring.extract_char_unsigned data !off !len bits in
+-    off := off'; len := len';
++    off := !off + bits; len := !len + bits;
+ 
+     let byte = byte lsl (8-bits) in
+     fprintf chan "%02x " byte;
diff --git a/virt-mem-0.3.1-dynlink.patch b/virt-mem-0.3.1-dynlink.patch
new file mode 100644
index 0000000..ad31f55
--- /dev/null
+++ b/virt-mem-0.3.1-dynlink.patch
@@ -0,0 +1,16 @@
+--- virt-mem-0.3.1.orig/extract/codegen/Makefile.in	2008-08-17 14:18:59.000000000 +0100
++++ virt-mem-0.3.1/extract/codegen/Makefile.in	2008-12-05 19:54:36.000000000 +0000
+@@ -27,11 +27,11 @@
+ OCAMLCPACKAGES	= -package extlib,pcre,unix,camlp4,bitstring -pp camlp4of
+ 
+ OCAMLCFLAGS	= @OCAMLCFLAGS@
+-OCAMLCLIBS	= -linkpkg camlp4lib.cma
++OCAMLCLIBS	= -linkpkg dynlink.cma camlp4lib.cma
+ 
+ OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@
+ OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
+-OCAMLOPTLIBS	= -linkpkg camlp4lib.cmxa
++OCAMLOPTLIBS	= -linkpkg dynlink.cmxa camlp4lib.cmxa
+ 
+ TARGETS		= compile-kerneldb.opt
+ 
diff --git a/virt-mem.spec b/virt-mem.spec
index 8dbae48..e8febb4 100644
--- a/virt-mem.spec
+++ b/virt-mem.spec
@@ -3,7 +3,7 @@
 
 Name:           virt-mem
 Version:        0.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Management tools for virtual machines
 
 Group:          Development/Libraries
@@ -12,6 +12,9 @@ URL:            http://et.redhat.com/~rjones/virt-mem/
 Source0:        http://et.redhat.com/~rjones/virt-mem/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         virt-mem-0.3.1-bitstring2.patch
+Patch1:         virt-mem-0.3.1-dynlink.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
@@ -20,7 +23,7 @@ BuildRequires:  ocaml-extlib-devel
 BuildRequires:  ocaml-libvirt-devel >= 0.4.4.2
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-xmlrpc-light-devel
-BuildRequires:  ocaml-bitstring-devel >= 1.9.7
+BuildRequires:  ocaml-bitstring-devel >= 2.0.0
 BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-gettext-devel
 BuildRequires:  ocaml-pcre-devel
@@ -69,6 +72,8 @@ and KVM, and more can be added just by adding support to libvirt.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -103,8 +108,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Dec  5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-3
+* Fri Dec  5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-4
 - Rebuild for OCaml 3.11.0.
+- Fix for bitstring 2.0.0.
+- Fix for dynlink.cma dep on camlp4.
 
 * Mon Aug 25 2008 Richard W.M. Jones <rjones@redhat.com> - 0.3.1-2
 - Forgot to add the new sources to previous release.