diff --git a/46897c1b-fs-type-fix.patch b/46897c1b-fs-type-fix.patch
new file mode 100644
index 0000000..a51176c
--- /dev/null
+++ b/46897c1b-fs-type-fix.patch
@@ -0,0 +1,39 @@
+From 0b41f4823f49c4d90b9b8bb1841aea65fb626013 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
+Date: Tue, 7 Jul 2015 16:20:31 +0200
+Subject: [glib] Don't overwrite filesystem type when writing format
+
+When setting filesystem driver format first and type, only the type
+remained and vice-versa.
+---
+ libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 8 ++++++--
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c
+index 9b73af5..4e33d5f 100644
+--- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c
++++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c
+@@ -125,7 +125,9 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys
+     GVirConfigObject *node;
+ 
+     g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys));
+-    node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver");
++    node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver");
++    if (!node)
++        node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver");
+     g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node));
+     if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT)
+         gvir_config_object_set_attribute_with_type(
+@@ -143,7 +145,9 @@ void gvir_config_domain_filesys_set_driver_format(GVirConfigDomainFilesys *files
+     GVirConfigObject *node;
+ 
+     g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys));
+-    node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver");
++    node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver");
++    if (!node)
++        node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver");
+     g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node));
+ 
+     gvir_config_object_set_attribute_with_type(
+2.1.4
+
diff --git a/libvirt-glib.changes b/libvirt-glib.changes
index 3223c99..d2144d7 100644
--- a/libvirt-glib.changes
+++ b/libvirt-glib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul  7 14:29:23 UTC 2015 - cbosdonnat@suse.com
+
+- Fix setting file system type and format.
+  bsc#936841 46897c1b-fs-type-fix.patch
+
 -------------------------------------------------------------------
 Thu Jun 25 10:12:36 UTC 2015 - zaitor@opensuse.org
 
diff --git a/libvirt-glib.spec b/libvirt-glib.spec
index b08da6f..769160a 100644
--- a/libvirt-glib.spec
+++ b/libvirt-glib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libvirt-glib
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@@ -25,6 +25,8 @@ License:        LGPL-2.1+
 Group:          System/Libraries
 Url:            http://libvirt.org
 Source:         http://libvirt.org/sources/glib/%{name}-%{version}.tar.gz
+# upstreamed patches
+Patch1:         46897c1b-fs-type-fix.patch
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  libtool
 BuildRequires:  vala
@@ -122,6 +124,7 @@ should be able to integrate other virtualization mechanisms if needed
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --disable-static