diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c27a614c104..2e68680c3fe 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -294,6 +294,9 @@ Bug Fixes
 
 * SOLR-6314: Multi-threaded facet counts differ when SolrCloud has >1 shard (Erick Erickson)
 
+* SOLR-6378: Fixed example/example-DIH/ issues with "tika" and "solr" configurations, and tidied up README.txt
+  (Daniel Shchyokin via ehatcher)
+
 Optimizations
 ---------------------
 
diff --git a/solr/example/example-DIH/README.txt b/solr/example/example-DIH/README.txt
index 98db213d2d0..5139bf87e39 100644
--- a/solr/example/example-DIH/README.txt
+++ b/solr/example/example-DIH/README.txt
@@ -21,26 +21,30 @@ Change to the parent (example) directory. Start solr by executing the following
 > cd ..
 > java -Dsolr.solr.home="./example-DIH/solr/" -jar start.jar
 
-in this directory, and when Solr is started connect to 
+in this directory, and when Solr is started connect to:
 
   http://localhost:8983/solr/
 
-To import data from the hsqldb database, connect to
+* To import data from the hsqldb database, connect to:
 
   http://localhost:8983/solr/db/dataimport?command=full-import
 
-To import data from the slashdot feed, connect to
+* To import data from an RSS feed, connect to:
 
   http://localhost:8983/solr/rss/dataimport?command=full-import
 
-To import data from your imap server
+* To import data from your IMAP server:
 
-1. Edit the example-DIH/solr/mail/conf/mail-data-config.xml and add details about username, password, imap server
-2. Connect to http://localhost:8983/solr/mail/dataimport?command=full-import
+  1. Edit the example-DIH/solr/mail/conf/mail-data-config.xml and add details about username, password, IMAP server
+  2. Connect to http://localhost:8983/solr/mail/dataimport?command=full-import
 
-To copy data from db Solr core, connect to
+* To copy data from db Solr core, connect to:
 
- http://localhost:8983/solr/solr/dataimport?command=full-import
+  http://localhost:8983/solr/solr/dataimport?command=full-import
+
+* To index a full text document using Tika integration:
+
+  http://localhost:8983/solr/tika/dataimport?command=full-import
 
 See also README.txt in the solr subdirectory, and check
 http://wiki.apache.org/solr/DataImportHandler for detailed
diff --git a/solr/example/example-DIH/hsqldb/ex.log b/solr/example/example-DIH/hsqldb/ex.log
index 77546171e56..26a8be8759b 100644
--- a/solr/example/example-DIH/hsqldb/ex.log
+++ b/solr/example/example-DIH/hsqldb/ex.log
@@ -1,2 +1,16 @@
-/*C1*/SET SCHEMA PUBLIC
+/*C2*/SET SCHEMA PUBLIC
 CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C3*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C4*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C5*/SET SCHEMA PUBLIC
+CONNECT USER SA
+SET AUTOCOMMIT FALSE
+/*C2*/DISCONNECT
+/*C3*/DISCONNECT
+/*C4*/DISCONNECT
+/*C5*/DISCONNECT
diff --git a/solr/example/example-DIH/hsqldb/ex.properties b/solr/example/example-DIH/hsqldb/ex.properties
index 83bd33db312..78ba896cce1 100644
--- a/solr/example/example-DIH/hsqldb/ex.properties
+++ b/solr/example/example-DIH/hsqldb/ex.properties
@@ -1,5 +1,5 @@
-#HSQL Database Engine 1.8.0.5
-#Fri Aug 29 10:24:33 IST 2008
+#HSQL Database Engine 1.8.0.10
+#Tue Aug 19 10:31:19 EDT 2014
 hsqldb.script_format=0
 runtime.gc_interval=0
 sql.enforce_strict_size=false
diff --git a/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml b/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml
index 48cf06e8ee5..63348c6d6bf 100644
--- a/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml
@@ -17,6 +17,9 @@
 
 <dataConfig>
   <document>
-    <entity name="sep" processor="SolrEntityProcessor" url="http://127.0.0.1:8983/solr/db " query="*:*"/>
+    <entity name="sep" processor="SolrEntityProcessor"
+            url="http://127.0.0.1:8983/solr/db "
+            query="*:*"
+            fl="*,orig_version_l:_version_"/>
   </document>
 </dataConfig>
diff --git a/solr/example/example-DIH/solr/tika/conf/tika-data-config.xml b/solr/example/example-DIH/solr/tika/conf/tika-data-config.xml
index 86f3679ad1e..70f75790b09 100644
--- a/solr/example/example-DIH/solr/tika/conf/tika-data-config.xml
+++ b/solr/example/example-DIH/solr/tika/conf/tika-data-config.xml
@@ -2,7 +2,7 @@
     <dataSource type="BinFileDataSource" />
     <document>
         <entity name="tika-test" processor="TikaEntityProcessor"
-                url="../contrib/extraction/src/test-files/extraction/solr-word.pdf" format="text">
+                url="exampledocs/solr-word.pdf" format="text">
                 <field column="Author" name="author" meta="true"/>
                 <field column="title" name="title" meta="true"/>
                 <field column="text" name="text"/>
diff --git a/solr/example/exampledocs/solr-word.pdf b/solr/example/exampledocs/solr-word.pdf
new file mode 100644
index 00000000000..bd8b865905f
Binary files /dev/null and b/solr/example/exampledocs/solr-word.pdf differ