diff --git a/applications/content/build.xml b/applications/content/build.xml
index b295c3356d2..426f379da57 100644
--- a/applications/content/build.xml
+++ b/applications/content/build.xml
@@ -62,9 +62,7 @@ under the License.
 
     <target name="clean-lucene-index">
         <delete verbose="on">
-            <fileset dir="index/" includes="*">
-                <exclude name="indexhere.txt"/>
-            </fileset>
+            <fileset dir="../../runtime/data/indexes/" includes="*"/>
         </delete>
     </target>
 </project>
diff --git a/applications/content/config/search.properties b/applications/content/config/search.properties
index dfe0788246f..e5e75aeef41 100644
--- a/applications/content/config/search.properties
+++ b/applications/content/config/search.properties
@@ -17,4 +17,4 @@
 # under the License.
 ###############################################################################
 
-defaultIndex=applications/content/index
+defaultIndex=runtime/data/indexes
diff --git a/applications/content/index/indexhere.txt b/applications/content/index/indexhere.txt
deleted file mode 100644
index e7b4f36c686..00000000000
--- a/applications/content/index/indexhere.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-#####################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#####################################################################
-
-The Lucene indexing files for the content manager go in this directory.
-
diff --git a/runtime/data/README b/runtime/data/README
index fb979e69ac6..4c4c419bbda 100644
--- a/runtime/data/README
+++ b/runtime/data/README
@@ -1 +1 @@
-The data (database) files, like the Derby files, will be put here.
+The data (database, search indexes etc.) files, like the Derby files, will be put here.