diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
index 786eecf7..b0bf61e7 100644
--- a/PVE/API2/Ceph.pm
+++ b/PVE/API2/Ceph.pm
@@ -138,17 +138,16 @@ __PACKAGE__->register_method ({
 	    }
 	}
 
-	my $rootnode;
+	my $roots = [];
 	foreach my $e (@{$res->{nodes}}) {
 	    if (!$nodes->{$e->{id}}->{parent}) {
-		$rootnode = $newnodes->{$e->{id}};
-		last;
+		push @$roots, $newnodes->{$e->{id}};
 	    }
 	}
 
-	die "no root node\n" if !$rootnode;
+	die "no root node\n" if !@$roots;
 
-	my $data = { root => $rootnode };
+	my $data = { root => { leaf =>  0, children => $roots } };
 
 	return $data;
     }});
diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 5f1b097c..786de597 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -7,6 +7,8 @@ pve-manager (4.1-27) unstable; urgency=medium
 
   * qemu monitor GUI: support page up/down
 
+  * Fix #936: ceph: support multiple roots in osd tree
+
  -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Apr 2016 17:12:09 +0200
 
 pve-manager (4.1-26) unstable; urgency=medium