diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index ca7b37bed..23d7291bd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -24,6 +24,7 @@ import static org.navalplanner.web.I18nHelper._;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -61,6 +62,7 @@ import org.zkoss.zul.SimpleListModel;
 import org.zkoss.zul.Tab;
 import org.zkoss.zul.Textbox;
 import org.zkoss.zul.api.Window;
+import org.navalplanner.web.resources.worker.WorkerCRUDController.LimitedResourceEnum;
 
 /**
  * Controller for {@link Machine} resource <br />
@@ -538,4 +540,23 @@ public class MachineCRUDController extends GenericForwardComposer {
                 .toArray()));
         listing.invalidate();
     }
-}
\ No newline at end of file
+
+    public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
+        return LimitedResourceEnum.getLimitedResourceOptionList();
+    }
+
+    public Object getLimitedResource() {
+        final Machine machine = getMachine();
+        return (machine != null) ? LimitedResourceEnum.valueOf(machine
+                .isLimitedResource())
+                : LimitedResourceEnum.NON_LIMITED_RESOURCE;         // Default option
+    }
+
+    public void setLimitedResource(LimitedResourceEnum option) {
+        Machine machine = getMachine();
+        if (machine != null) {
+            machine.setLimitedResource(LimitedResourceEnum.LIMITED_RESOURCE.equals(option));
+        }
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index c319cc406..f61571561 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -628,7 +628,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         listing.invalidate();
     }
 
-    private enum LimitedResourceEnum {
+    public enum LimitedResourceEnum {
         ALL(""),
         LIMITED_RESOURCE(_("LIMITED RESOURCE")),
         NON_LIMITED_RESOURCE(_("NON LIMITED RESOURCE"));
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
index 21394856d..5534c2bd5 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -54,6 +54,13 @@
                             <textbox value="@{controller.machine.description}" width="500px"
                                 constraint="no empty:${i18n:_('Description cannot be null or empty')}" />
                         </row>
+                       <row>
+                            <label value="${i18n:_('Limted resource')}" />
+                            <combobox id="cbLimitedResource" width="200px"
+                                model="@{controller.limitedResourceOptionList}"
+                                selectedItem="@{controller.limitedResource}"
+                                onSelect="controller.setLimitedResource(self.selectedItem.value);" />
+                        </row>
                     </rows>
                 </grid>
             </tabpanel>