diff --git a/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.Calculator.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.Calculator.bus.xml
new file mode 120000
index 0000000000..ec1e9c8218
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.Calculator.bus.xml
@@ -0,0 +1 @@
+org.opensuse.Agama.Storage1.bus.xml
\ No newline at end of file
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
new file mode 100644
index 0000000000..5a973c8df4
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama.Storage1.Proposal.Calculator.doc.xml
@@ -0,0 +1,67 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/opensuse/Agama/Storage1">
+  <node name="zfcp_controllers" />
+  <node name="zfcp_disks" />
+  <!--
+    Interface for calculating a new storage proposal.
+  -->
+  <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
+    <!--
+      Gets the default values for a volume with the given mount path.
+    -->
+    <method name="DefaultVolume">
+      <!--
+        E.g., /home
+      -->
+      <arg name="mount_path" direction="in" type="s"/>
+      <!--
+        MountPath               s
+        MountOptions            as
+        TargetDevice            s
+        TargetVG                s
+        FsType                  s
+        MinSize                 t
+        MaxSize                 t (optinal, max size is considered as unlimited if omitted)
+        AutoSize                b
+        Snapshots               b
+        Outline                 a{sv}
+          Required              b
+          FsTypes               as
+          SupportAutoSize       b
+          SnapshotsConfigurable b
+          SnapshotsAffectSizes  b
+          SizeRelevantVolumes   as
+      -->
+      <arg name="volume" direction="out" type="a{sv}"/>
+    </method>
+    <!--
+      Calculates a new proposal.
+    -->
+    <method name="Calculate">
+    <!--
+      BootDevice              s
+      LVM                     b
+      SystemVGDevices         as
+      EncryptionPassword      s
+      EncryptionMethod        s
+      EncryptionPBKDFunction  s
+      SpacePolicy             s
+      SpaceActions            a{ss}
+      Volumes                 aa{sv}
+        List of volumes to create. The values for each volume are the same as the values returned
+        by DefaultVolume method. The Outline (if given) would be ignored.
+    -->
+      <arg name="settings" direction="in" type="a{sv}"/>
+      <arg name="result" direction="out" type="u"/>
+    </method>
+    <property type="ao" name="AvailableDevices" access="read"/>
+    <!--
+      Relevant mount points for the selected product. Normally, the product defines some specific
+      values for these mount points (e.g., min and max sizes, file system type, etc).
+    -->
+    <property type="as" name="ProductMountPoints" access="read"/>
+    <property type="o" name="Result" access="read"/>
+  </interface>
+
+</node>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
index e44c1713e0..2a51000dd2 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
@@ -22,65 +22,4 @@
     -->
     <property type="b" name="DeprecatedSystem" access="read"/>
   </interface>
-  <!--
-    Interface for calculating a new storage proposal.
-  -->
-  <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
-    <!--
-      Gets the default values for a volume with the given mount path.
-    -->
-    <method name="DefaultVolume">
-      <!--
-        E.g., /home
-      -->
-      <arg name="mount_path" direction="in" type="s"/>
-      <!--
-        MountPath               s
-        MountOptions            as
-        TargetDevice            s
-        TargetVG                s
-        FsType                  s
-        MinSize                 t
-        MaxSize                 t (optinal, max size is considered as unlimited if omitted)
-        AutoSize                b
-        Snapshots               b
-        Outline                 a{sv}
-          Required              b
-          FsTypes               as
-          SupportAutoSize       b
-          SnapshotsConfigurable b
-          SnapshotsAffectSizes  b
-          SizeRelevantVolumes   as
-      -->
-      <arg name="volume" direction="out" type="a{sv}"/>
-    </method>
-    <!--
-      Calculates a new proposal.
-    -->
-    <method name="Calculate">
-    <!--
-      BootDevice              s
-      LVM                     b
-      SystemVGDevices         as
-      EncryptionPassword      s
-      EncryptionMethod        s
-      EncryptionPBKDFunction  s
-      SpacePolicy             s
-      SpaceActions            a{ss}
-      Volumes                 aa{sv}
-        List of volumes to create. The values for each volume are the same as the values returned
-        by DefaultVolume method. The Outline (if given) would be ignored.
-    -->
-      <arg name="settings" direction="in" type="a{sv}"/>
-      <arg name="result" direction="out" type="u"/>
-    </method>
-    <property type="ao" name="AvailableDevices" access="read"/>
-    <!--
-      Relevant mount points for the selected product. Normally, the product defines some specific
-      values for these mount points (e.g., min and max sizes, file system type, etc).
-    -->
-    <property type="as" name="ProductMountPoints" access="read"/>
-    <property type="o" name="Result" access="read"/>
-  </interface>
-
 </node>