diff --git a/.gitignore b/.gitignore
index 8350672..9a7b374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libgovirt-0.1.0.tar.xz
+SOURCES/libgovirt-0.3.1.tar.xz
diff --git a/.libgovirt.metadata b/.libgovirt.metadata
index 1a35d04..f2c05f5 100644
--- a/.libgovirt.metadata
+++ b/.libgovirt.metadata
@@ -1 +1 @@
-0199f8649c5288e4ba67f7250fdcc72f0bc410b1 SOURCES/libgovirt-0.1.0.tar.xz
+d9d1a0f7ef8db841f39e2f7c8f3a75c8da86db47 SOURCES/libgovirt-0.3.1.tar.xz
diff --git a/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch b/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch
new file mode 100644
index 0000000..4612068
--- /dev/null
+++ b/SOURCES/0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch
@@ -0,0 +1,37 @@
+From bdb788fcced810b45d7c02882c80114477576a46 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau@redhat.com>
+Date: Mon, 22 Sep 2014 14:11:07 +0200
+Subject: [PATCH] cdrom: Allow empty filename when serializing to XML
+
+Removing a CDROM image from a VM is achieved by updating the current VM
+file to be "". The code currently forbid NULL filenames in update
+requests, this commit removes this limitation so that it's possible to
+remove a CD image from a VM through libgovirt.
+---
+ govirt/ovirt-cdrom.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/govirt/ovirt-cdrom.c b/govirt/ovirt-cdrom.c
+index 020159c..d852403 100644
+--- a/govirt/ovirt-cdrom.c
++++ b/govirt/ovirt-cdrom.c
+@@ -151,13 +151,16 @@ static gboolean ovirt_cdrom_init_from_xml(OvirtResource *resource,
+ static char *ovirt_cdrom_to_xml(OvirtResource *resource)
+ {
+     OvirtCdrom *cdrom;
++    const char *file;
+ 
+     g_return_val_if_fail(OVIRT_IS_CDROM(resource), NULL);
+     cdrom = OVIRT_CDROM(resource);
+-    g_return_val_if_fail(cdrom->priv->file != NULL, NULL);
++    file = cdrom->priv->file;
++    if (file == NULL) {
++        file = "";
++    }
+ 
+-    return g_strdup_printf("<cdrom>\n\t<file id=\"%s\"/>\n</cdrom>",
+-                           cdrom->priv->file);
++    return g_strdup_printf("<cdrom>\n\t<file id=\"%s\"/>\n</cdrom>", file);
+ }
+ 
+ 
diff --git a/SPECS/libgovirt.spec b/SPECS/libgovirt.spec
index 82cdd41..1204256 100644
--- a/SPECS/libgovirt.spec
+++ b/SPECS/libgovirt.spec
@@ -8,17 +8,19 @@
 
 Summary: A GObject library for interacting with oVirt REST API
 Name: libgovirt
-Version: 0.1.0
+Version: 0.3.1
 Release: 3%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
-Source: http://people.freedesktop.org/~teuf/govirt/%{name}-%{version}.tar.xz
+Source: http://ftp.gnome.org/pub/GNOME/sources/libgovirt/0.3/%{name}-%{version}.tar.xz
+Patch0: 0001-cdrom-Allow-empty-filename-when-serializing-to-XML.patch
 URL: http://people.freedesktop.org/~teuf/govirt/
 BuildRequires: glib2-devel
-BuildRequires: rest-devel >= 0.7.90
+BuildRequires: rest-devel >= 0.7.92
 %if %{with_gir}
 BuildRequires: gobject-introspection-devel
 %endif
+Requires: rest >= 0.7.92
 
 %description
 libgovirt is a library that allows applications to use oVirt REST API
@@ -41,6 +43,7 @@ Libraries, includes, etc. to compile with the libgovirt library
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if %{with_gir}
@@ -66,7 +69,7 @@ make check
 
 %files
 %doc AUTHORS COPYING MAINTAINERS README
-%{_libdir}/%{name}.so.1*
+%{_libdir}/%{name}.so.2*
 %if %{with_gir}
 %{_libdir}/girepository-1.0/GoVirt-1.0.typelib
 %endif
@@ -82,6 +85,23 @@ make check
 %endif
 
 %changelog
+* Fri Oct 10 2014 Christophe Fergeau <cfergeau@redhat.com> 0.3.1-3
+- Add upstream patch allowing to remove CD images from an OvirtCdrom
+  Resolves: rhbz#1151171
+
+* Tue Sep 30 2014 Christophe Fergeau <cfergeau@redhat.com> 0.3.1-2
+- Requires a new enough librest as we use symbols not available in older
+  librest
+  Related: rhbz#1116844
+
+* Mon Sep 08 2014 Christophe Fergeau <cfergeau@redhat.com> 0.3.1-1
+- Rebase to libgovirt 0.3.1.
+  Resolves: rhbz#1116844
+
+* Mon Jul  7 2014 Marc-Andre Lureau <marcandre.lureau@redhat.com> - 0.3.0-1
+- Rebase to libgovirt 0.3.0.
+  Resolves: rhbz#1116844
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.1.0-3
 - Mass rebuild 2014-01-24