diff --git a/.travis.yml b/.travis.yml
index e5089327e..d13dacb39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ before_install:
   - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org"
 install:
   - cpanm  --quiet  --notest --skip-installed Dist::Zilla
-  - dzil authordeps | grep -ve '^\W' | xargs -n 5 -P 10 cpanm  --quiet   --notest  --skip-installed
+  - dzil authordeps | grep -ve '^\W' | xargs -n 5 -P 10 cpanm  --quiet   --notest  --skip-installed  --mirror http://www.cpan.org/ --mirror http://duckpan.org
   - dzil listdeps | grep -ve '^\W' | cpanm  --quiet   --notest  --skip-installed
   - cpanm  --quiet   --notest  App::DuckPAN autodie
   - duckpan DDG
diff --git a/dist.ini b/dist.ini
index 85b177e4b..e3931603c 100644
--- a/dist.ini
+++ b/dist.ini
@@ -11,6 +11,7 @@ main_module = lib/DDG/GoodieBundle/OpenSourceDuckDuckGo.pm
 [PromptIfStale]
 index = http://duckpan.org
 module = Dist::Zilla::Plugin::UploadToDuckPAN
+module = Dist::Zilla::Plugin::BuildShareAssets
 
 [Prereqs]
 Time::Duration = 1.1
@@ -47,7 +48,6 @@ CGI = 3.60
 Email::Valid = 1.192
 Net::Domain::TLD = 1.70
 Convert::Pluggable = 0.027
-YAML = 0
 Encode = 2.62
 ; ParseCron
 Schedule::Cron::Events = 0
@@ -108,34 +108,29 @@ File::Temp = 0.22
 run = mkdir -p share/goodie/meta
 run = curl https://duck.co/ia/repo/goodies/json -o "share/goodie/meta/metadata.json"
 [GatherDir]
+[BuildShareAssets]
+[PruneFiles]
+match = \.(?:handlebars|ini|p[ly]|rb|go|tcl|sh|md|tx|gitignore)$
+; No javascript files, except those we build, i.e. .spice.js
+match = ^share/.+(?<!\.goodie)\.js$
 [PruneCruft]
-[ManifestSkip]
-[ExtraTests]
-[ExecDir]
-[ShareDir]
 [MakeMaker]
 [Manifest]
 [TestRelease]
 [ConfirmRelease]
 [UploadToDuckPAN]
 [MetaJSON]
-[MetaYAML]
 
 [AutoModuleShareDirs]
-scan_namespaces = DDG::Goodie,DDG::Spice
+scan_namespaces = DDG::Goodie
 sharedir_method = module_share_dir
 
 [Git::NextVersion]
 version_regexp = ^(.+)$
 [PkgVersion]
-[PodSyntaxTests]
 [GithubMeta]
-[Test::EOL]
-trailing_whitespace = 0
 [@Git]
 tag_format = %v
 
-[PodWeaver]
-
 [Git::Push]
 push_to = origin master
diff --git a/weaver.ini b/weaver.ini
deleted file mode 100644
index b3eb2cddf..000000000
--- a/weaver.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[@CorePrep]
-
-[Name]
-[Version]
-
-[Region  / prelude]
-
-[Generic / SYNOPSIS]
-[Generic / DESCRIPTION]
-[Generic / OVERVIEW]
-
-[Collect / EXPORTS FUNCTIONS]
-command = keyword
-
-[Collect / ATTRIBUTES]
-command = attr
-
-[Collect / METHODS]
-command = method
-
-[Leftovers]
-
-[Region  / postlude]
-
-[Authors]
-
-[Legal]
-