diff --git a/abusesasearch/Makefile b/abusesasearch/Makefile
index 082492c..681d839 100644
--- a/abusesasearch/Makefile
+++ b/abusesasearch/Makefile
@@ -14,4 +14,4 @@ $(PACKAGES)/$(TARGET):
 
 $(MANIFESTS)/abusesasearch.pp: $(PACKAGES)/$(TARGET)
 	@umask 022; echo $@; \
-	echo '$$abusesa_search_package_latest = "$(TARGET)"' > $@
+	echo '$$abusesasearch_package_latest = "$(TARGET)"' > $@
diff --git a/abusesasearch/manifests/init.pp b/abusesasearch/manifests/init.pp
index 9699e89..a490ce8 100644
--- a/abusesasearch/manifests/init.pp
+++ b/abusesasearch/manifests/init.pp
@@ -27,7 +27,6 @@ class abusesasearch {
     }
 
     python::setup::install { "/usr/local/src/abusesa-search": }
-    python::setup::install { "/usr/local/src/abusesa-search/sources/solrbot": }
 
     package { [ "python-beautifulsoup",
                 "python-pysolr",
@@ -55,7 +54,6 @@ class abusesasearch {
         owner   => "solr",
         group   => "solr",
         source  => "/usr/local/src/abusesa-search/bin/solr-4.1-analysis-clarified.jar",
-        require => Util::Extract::Tar["/usr/local/src/abusesa-search"],
         require => [
             File["/srv/solr/cores/lib"],
             Util::Extract::Tar["/usr/local/src/abusesa-search"],