diff --git a/modules/openstack_project/files/ask/jetty_1.0_all.deb b/modules/openstack_project/files/ask/jetty_1.0_all.deb
new file mode 100644
index 0000000000..15d9e6af85
Binary files /dev/null and b/modules/openstack_project/files/ask/jetty_1.0_all.deb differ
diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index a42e9ce624..a295e79243 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -17,6 +17,29 @@ class openstack_project::ask (
   $askbot_revision              = '87086ebcefc5be29e80d3228e465e6bec4523fcf'
 ) {
 
+  if $::lsbdistcodename == "xenial" {
+    # NOTE(ianw) This is a horrible, horrible hack because puppet-solr
+    # has not been updated to handle Xenial where jetty split into a
+    # jetty8 package.  This equivs deb pre-depends on jetty8, and sets
+    # up a few links to fool (confuse?) puppet-solr enough to install
+    # and run...
+    file { '/root/jetty_1.0_all.deb':
+      ensure => present,
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
+      source => 'puppet://modules/openstack_project/ask/jetty_1.0_all.deb'
+    }
+
+    package { 'jetty':
+      provider => dpkg,
+      state    => installed,
+      source   => "/root/jetty_1.0_all.deb",
+      require  => File['/root/jetty_1.0_all.deb']
+    }
+
+  }
+
   file { '/srv/dist':
     ensure => directory,
     owner  => 'root',