diff --git a/db/update17.1.sql b/db/update17.1.sql
index 743e36008e..fd0d6f1fae 100644
--- a/db/update17.1.sql
+++ b/db/update17.1.sql
@@ -3,4 +3,7 @@ CREATE TABLE `zt_riskissue` (
   `risk` mediumint(8) unsigned NOT NULL,
   `issue` mediumint(8) unsigned NOT NULL,
   UNIQUE KEY `risk_issue` (`risk`,`issue`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `zt_kanban`
+ADD `showWIP` enum('0','1') NOT NULL DEFAULT '1' AFTER `displayCards`;
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 4707cb8abb..dc53db4ab4 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1344,6 +1344,7 @@ function initKanban($kanban)
         onRenderLaneName:      renderLaneName,
         onRenderHeaderCol:     renderHeaderCol,
         onRenderCount:         renderCount,
+        showCount:             kanban.showWIP == '1' ? true : false,
         sortable:              handleSortCards,
         virtualize:            true,
         virtualRenderOptions:  {container: $(window).add($('#kanbanContainer'))},
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 41ead183c4..f63492f532 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -198,6 +198,7 @@ $lang->kanban->fullScreen         = '全屏';
 $lang->kanban->setting            = '设置';
 $lang->kanban->my                 = '我的看板';
 $lang->kanban->other              = '其他';
+$lang->kanban->showWIP            = '显示在制品限制';
 
 $lang->kanban->error = new stdclass();
 $lang->kanban->error->mustBeInt         = '在制品数量必须是正整数。';
@@ -217,6 +218,9 @@ $lang->kanban->importObjectList['builds']     = '版本';
 $lang->kanban->importObjectList['executions'] = $lang->execution->common;
 $lang->kanban->importObjectList['cards']      = '其他看板卡片';
 
+$lang->kanban->showWIPList[1] = '显示';
+$lang->kanban->showWIPList[0] = '不显示';
+
 $lang->kanban->defaultColumn = array();
 $lang->kanban->defaultColumn['wait']   = '未开始';
 $lang->kanban->defaultColumn['doing']  = '进行中';
diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php
index 624b95b5ac..4af174b6ec 100644
--- a/module/kanban/view/create.html.php
+++ b/module/kanban/view/create.html.php
@@ -24,6 +24,11 @@
         <td><?php echo html::radio('type', $typeList, $type, "onchange='changeValue({$spaceID}, this.value)'");?></td>
         <td></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->kanban->WIPCount;?></th>
+        <td><?php echo html::radio('showWIP', $lang->kanban->showWIPList, 1);?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanban->space;?></th>
         <td><?php echo html::select('space', $spacePairs, $spaceID, "onchange='changeValue(this.value)' class='form-control chosen'");?></td>
diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php
index 7fc39ab025..0c3cf4ed9f 100644
--- a/module/kanban/view/edit.html.php
+++ b/module/kanban/view/edit.html.php
@@ -22,6 +22,11 @@
         <th><?php echo $lang->kanban->space;?></th>
         <td><?php echo html::select('space', $spacePairs, $kanban->space, "class='form-control chosen'");?></td>
       </tr>
+      <tr>
+        <th><?php echo $lang->kanban->WIPCount;?></th>
+        <td><?php echo html::radio('showWIP', $lang->kanban->showWIPList, $kanban->showWIP);?></td>
+        <td></td>
+      </tr>
       <tr>
         <th><?php echo $lang->kanban->name;?></th>
         <td><?php echo html::input('name', $kanban->name, "class='form-control'");?></td>