diff --git a/config/alfresco/public-rest-context.xml b/config/alfresco/public-rest-context.xml
index eb58a57945..c7e8094d58 100644
--- a/config/alfresco/public-rest-context.xml
+++ b/config/alfresco/public-rest-context.xml
@@ -870,6 +870,7 @@
         <property name="moduleService" ref="ModuleService" />
         <property name="assistant" ref="apiAssistant" />
         <property name="enabled" value="${system.api.discovery.enabled}" />
+        <property name="thumbnailService" ref="ThumbnailService" />
     </bean>
 
     <!-- OpenCMIS -->
diff --git a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
index 62a4b49717..f0f6b856f9 100644
--- a/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
+++ b/source/java/org/alfresco/rest/api/discovery/DiscoveryApiWebscript.java
@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.audit.AuditService;
 import org.alfresco.service.cmr.module.ModuleDetails;
 import org.alfresco.service.cmr.module.ModuleService;
 import org.alfresco.service.cmr.quickshare.QuickShareService;
+import org.alfresco.service.cmr.thumbnail.ThumbnailService;
 import org.alfresco.service.descriptor.Descriptor;
 import org.alfresco.service.descriptor.DescriptorService;
 import org.alfresco.util.PropertyCheck;
@@ -65,6 +66,7 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
     private QuickShareService quickShareService;
     private ModuleService moduleService;
     private ApiAssistant assistant;
+    private ThumbnailService thumbnailService;
 
     private boolean enabled = true;
     private final static String DISABLED = "Not Implemented";
@@ -99,6 +101,11 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
         this.assistant = assistant;
     }
 
+    public void setThumbnailService(ThumbnailService thumbnailService)
+    {
+        this.thumbnailService = thumbnailService;
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception
     {
@@ -108,6 +115,7 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
         PropertyCheck.mandatory(this, "quickShareService", quickShareService);
         PropertyCheck.mandatory(this, "moduleService", moduleService);
         PropertyCheck.mandatory(this, "assistant", assistant);
+        PropertyCheck.mandatory(this, "thumbnailService", thumbnailService);
     }
 
     @Override
@@ -144,7 +152,8 @@ public class DiscoveryApiWebscript extends AbstractWebScript implements Recogniz
                     .setStatus(new StatusInfo()
                                 .setReadOnly(repoAdminService.getUsage().isReadOnly())
                                 .setAuditEnabled(auditService.isAuditEnabled())
-                                .setQuickShareEnabled(quickShareService.isQuickShareEnabled()));
+                                .setQuickShareEnabled(quickShareService.isQuickShareEnabled())
+                                .setThumbnailGenerationEnabled(thumbnailService.getThumbnailsEnabled()));
     }
 
     private List<ModulePackage> getModules()
diff --git a/source/java/org/alfresco/rest/api/model/RepositoryInfo.java b/source/java/org/alfresco/rest/api/model/RepositoryInfo.java
index fe5408ef33..e563df01e4 100644
--- a/source/java/org/alfresco/rest/api/model/RepositoryInfo.java
+++ b/source/java/org/alfresco/rest/api/model/RepositoryInfo.java
@@ -403,6 +403,7 @@ public class RepositoryInfo
         private boolean isReadOnly;
         private boolean isAuditEnabled;
         private boolean isQuickShareEnabled;
+        private boolean isThumbnailGenerationEnabled;
 
         public StatusInfo()
         {
@@ -441,6 +442,17 @@ public class RepositoryInfo
             return this;
         }
 
+        public boolean getIsThumbnailGenerationEnabled()
+        {
+            return isThumbnailGenerationEnabled;
+        }
+
+        public StatusInfo setThumbnailGenerationEnabled(boolean isThumbnailGenerationEnabled)
+        {
+            this.isThumbnailGenerationEnabled = isThumbnailGenerationEnabled;
+            return this;
+        }
+
         @Override
         public String toString()
         {
@@ -448,6 +460,7 @@ public class RepositoryInfo
             sb.append("StatusInfo [isReadOnly=").append(isReadOnly)
                         .append(", isAuditEnabled=").append(isAuditEnabled)
                         .append(", isQuickShareEnabled=").append(isQuickShareEnabled)
+                        .append(", isThumbnailGenerationEnabled=").append(isThumbnailGenerationEnabled)
                         .append(']');
             return sb.toString();
         }
diff --git a/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java b/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
index 94036a2c22..b6d393dadf 100644
--- a/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
+++ b/source/test-java/org/alfresco/rest/api/tests/DiscoveryApiTest.java
@@ -179,6 +179,7 @@ public class DiscoveryApiTest extends AbstractSingleNetworkSiteTest
         assertFalse(statusInfo.getIsReadOnly());
         assertTrue(statusInfo.getIsAuditEnabled());
         assertTrue(statusInfo.getIsQuickShareEnabled());
+        assertTrue(statusInfo.getIsThumbnailGenerationEnabled());
 
         // Check modules
         List<ModulePackage> modulePackageList = repositoryInfo.getModules();