diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java
new file mode 100644
index 0000000000..6c42e7f43e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceFileInfoPlugin.java
@@ -0,0 +1,70 @@
+package org.dspace.discovery;
+
+import org.apache.solr.common.SolrInputDocument;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+import java.util.List;
+
+/**
+ * <p>
+ * Adds filenames and file descriptions of all files in the ORIGINAL bundle
+ * to the Solr search index.
+ *
+ * <p>
+ * To activate the plugin, add the following line to discovery.xml
+ * <pre>
+ * {@code <bean id="solrServiceFileInfoPlugin" class="org.dspace.discovery.SolrServiceFileInfoPlugin"/>}
+ * </pre>
+ *
+ * <p>
+ * After activating the plugin, rebuild the discovery index by executing:
+ * <pre>
+ * [dspace]/bin/dspace index-discovery -b
+ * </pre>
+ *
+ * @author Martin Walk
+ */
+public class SolrServiceFileInfoPlugin implements SolrServiceIndexPlugin
+{
+    private static final String BUNDLE_NAME = "ORIGINAL";
+    private static final String SOLR_FIELD_NAME_FOR_FILENAMES = "original_bundle_filenames";
+    private static final String SOLR_FIELD_NAME_FOR_DESCRIPTIONS = "original_bundle_descriptions";
+
+    @Override
+    public void additionalIndex(Context context, DSpaceObject dso, SolrInputDocument document)
+    {
+        if (dso instanceof Item)
+        {
+            Item item = (Item) dso;
+            List<Bundle> bundles = item.getBundles();
+            if (bundles != null)
+            {
+                for (Bundle bundle : bundles)
+                {
+                    String bundleName = bundle.getName();
+                    if ((bundleName != null) && bundleName.equals(BUNDLE_NAME))
+                    {
+                        List<Bitstream> bitstreams = bundle.getBitstreams();
+                        if (bitstreams != null)
+                        {
+                            for (Bitstream bitstream : bitstreams)
+                            {
+                                document.addField(SOLR_FIELD_NAME_FOR_FILENAMES, bitstream.getName());
+
+                                String description = bitstream.getDescription();
+                                if ((description != null) && (!description.isEmpty()))
+                                {
+                                    document.addField(SOLR_FIELD_NAME_FOR_DESCRIPTIONS, description);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index 1add0dcaa5..a17abfef71 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -31,6 +31,9 @@
     <!-- Additional indexing plugin make filtering by has content in original bundle (like pdf's, images) posible via SOLR -->
     <bean id="hasContentInOriginalBundle" class="org.dspace.discovery.SolrServiceContentInOriginalBundleFilterPlugin"/>
 
+    <!-- Additional indexing plugin enables searching by filenames and by file descriptions for files in ORIGINAL bundle -->
+    <bean id="solrServiceFileInfoPlugin" class="org.dspace.discovery.SolrServiceFileInfoPlugin"/>
+
     <!--Bean that is used for mapping communities/collections to certain discovery configurations.-->
     <bean id="org.dspace.discovery.configuration.DiscoveryConfigurationService" class="org.dspace.discovery.configuration.DiscoveryConfigurationService">
         <property name="map">