diff --git a/conf/solr-jetty.xml b/conf/solr-jetty.xml
new file mode 100644
index 00000000..27de9994
--- /dev/null
+++ b/conf/solr-jetty.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<!-- Context configuration file for the Solr web application in Jetty -->
+
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+  <Set name="contextPath">/solr</Set>
+  <Set name="war">/usr/share/solr/web</Set>
+
+  <!-- Set the solr.solr.home system property -->
+  <Call name="setProperty" class="java.lang.System">
+    <Arg type="String">solr.solr.home</Arg>
+    <Arg type="String">/usr/share/solr</Arg>
+  </Call>
+
+  <!-- Enable symlinks -->
+  <!--  <Call name="addAliasCheck">
+    <Arg>
+      <New class="org.eclipse.jetty.server.handler.ContextHandler$ApproveSameSuffixAliases"/>
+    </Arg>
+  </Call>-->
+</Configure>
diff --git a/setup/solr.sh b/setup/solr.sh
index 16cc3f14..9b13ceb9 100644
--- a/setup/solr.sh
+++ b/setup/solr.sh
@@ -28,6 +28,9 @@ apt_install solr-jetty dovecot-solr
 # Solr requires a schema to tell it how to index data, this is provided by dovecot
 cp /usr/share/dovecot/solr-schema.xml /etc/solr/conf/schema.xml
 
+# Default config has an error with our config, placing our custom version
+cp conf/solr-jetty.xml  /etc/solr/solr-jetty.xml
+
 # Update the dovecot plugin configuration
 #
 # Break-imap-search makes search work the way users expect, rather than the way