diff --git a/Controller/SystemManagerController.php b/Controller/SystemManagerController.php
index 380d2af..b2439e6 100644
--- a/Controller/SystemManagerController.php
+++ b/Controller/SystemManagerController.php
@@ -48,12 +48,23 @@ public function edit() {
 				)
 			));
 
-			$spaces = $this->Space->cacheFindQuery('all', array(
-				'recursive' => -1,
-				'conditions' => array('id' => [Space::PRIVATE_SPACE_ID, Space::COMMUNITY_SPACE_ID]),
-			));
+			$spaces = $this->Space->cacheFindQuery(
+				'all',
+				[
+					'recursive' => -1,
+					'conditions' => [
+						'id' => [
+							Space::PRIVATE_SPACE_ID,
+							Space::COMMUNITY_SPACE_ID,
+							Space::PUBLIC_SPACE_ID
+						]
+					],
+				]
+			);
 
 			$setSpaceDisk = array(
+				// パブリックルームの容量
+				Space::PUBLIC_SPACE_ID => 'App.disk_for_public_room',
 				// * グループルームの容量
 				Space::COMMUNITY_SPACE_ID => 'App.disk_for_group_room',
 				// * プライベートルームの容量
diff --git a/Locale/eng/LC_MESSAGES/system_manager.po b/Locale/eng/LC_MESSAGES/system_manager.po
index 0481464..dcfe6da 100644
--- a/Locale/eng/LC_MESSAGES/system_manager.po
+++ b/Locale/eng/LC_MESSAGES/system_manager.po
@@ -50,6 +50,12 @@ msgstr ""
 msgid "App.default_timezone"
 msgstr "Default timezone"
 
+msgid "App.disk_for_public_room"
+msgstr "Disk space for public room"
+
+msgid "App.disk_for_public_room help"
+msgstr "Set the limit of the total amount of files which can be stored in each public room."
+
 #: SystemManager/View/Elements/SystemManager/general_form.ctp:37
 msgid "App.disk_for_group_room"
 msgstr "Disk space for community room"
diff --git a/Locale/jpn/LC_MESSAGES/system_manager.po b/Locale/jpn/LC_MESSAGES/system_manager.po
index c3797bf..c81b6df 100644
--- a/Locale/jpn/LC_MESSAGES/system_manager.po
+++ b/Locale/jpn/LC_MESSAGES/system_manager.po
@@ -50,6 +50,12 @@ msgstr "無制限"
 msgid "App.default_timezone"
 msgstr "デフォルトのタイムゾーン"
 
+msgid "App.disk_for_public_room"
+msgstr "各パブリックルームの容量"
+
+msgid "App.disk_for_public_room help"
+msgstr "各パブリックルームにアップロードできるファイルの総量を指定します。"
+
 #: SystemManager/View/Elements/SystemManager/general_form.ctp:37
 msgid "App.disk_for_group_room"
 msgstr "各コミュニティの容量"
diff --git a/View/Elements/SystemManager/general_form.ctp b/View/Elements/SystemManager/general_form.ctp
index 46cc493..c8f80b8 100644
--- a/View/Elements/SystemManager/general_form.ctp
+++ b/View/Elements/SystemManager/general_form.ctp
@@ -31,6 +31,13 @@ foreach ($SiteSetting->diskSpace as $size) {
 		'label' => __d('system_manager', 'App.default_timezone'),
 	)); ?>
 
+	<?php echo $this->SystemManager->inputCommon('SiteSetting', 'App.disk_for_public_room', array(
+		'type' => 'select',
+		'options' => $diskSpace,
+		'label' => __d('system_manager', 'App.disk_for_public_room'),
+		'help' => __d('system_manager', 'App.disk_for_public_room help'),
+	)); ?>
+
 	<?php echo $this->SystemManager->inputCommon('SiteSetting', 'App.disk_for_group_room', array(
 		'type' => 'select',
 		'options' => $diskSpace,