diff --git a/conf/3.x/solrconfig.xml b/conf/3.x/solrconfig.xml
index 44de95b..7779a9d 100644
--- a/conf/3.x/solrconfig.xml
+++ b/conf/3.x/solrconfig.xml
@@ -68,8 +68,9 @@
        the classpath, this is useful for including all jars in a
        directory.
     -->
-  <lib dir="../../contrib/extraction/lib" />
-  <lib dir="../../contrib/clustering/lib/" />
+  <lib dir="${solr.contrib.dir:../../contrib}/extraction/lib" />
+  <lib dir="${solr.contrib.dir:../../contrib}/clustering/lib/" />
+
   <!-- The velocity library has been known to crash Solr in some
        instances when deployed as a war file to Tomcat. Therefore all
        references have been removed from the default configuration.
diff --git a/conf/3.x/solrcore.properties b/conf/3.x/solrcore.properties
index 07c8db8..fe57332 100644
--- a/conf/3.x/solrcore.properties
+++ b/conf/3.x/solrcore.properties
@@ -10,3 +10,4 @@ solr.luceneMatchVersion=LUCENE_35
 solr.pinkPony.timeAllowed=-1
 solr.autoCommit.MaxDocs=10000
 solr.autoCommit.MaxTime=120000
+solr.contrib.dir=../../contrib
\ No newline at end of file
diff --git a/conf/4.x/solrconfig.xml b/conf/4.x/solrconfig.xml
index f713710..03620b8 100644
--- a/conf/4.x/solrconfig.xml
+++ b/conf/4.x/solrconfig.xml
@@ -68,8 +68,9 @@
        the classpath, this is useful for including all jars in a
        directory.
     -->
-  <lib dir="../../contrib/extraction/lib" />
-  <lib dir="../../contrib/clustering/lib/" />
+  <lib dir="${solr.contrib.dir:../../../contrib}/extraction/lib" />
+  <lib dir="${solr.contrib.dir:../../../contrib}/clustering/lib/" />
+
   <!-- The velocity library has been known to crash Solr in some
        instances when deployed as a war file to Tomcat. Therefore all
        references have been removed from the default configuration.
diff --git a/conf/4.x/solrcore.properties b/conf/4.x/solrcore.properties
index 53f3d13..61b7eb4 100644
--- a/conf/4.x/solrcore.properties
+++ b/conf/4.x/solrcore.properties
@@ -10,3 +10,4 @@ solr.luceneMatchVersion=LUCENE_40
 solr.pinkPony.timeAllowed=-1
 solr.autoCommit.MaxDocs=10000
 solr.autoCommit.MaxTime=120000
+solr.contrib.dir=../../../contrib