diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07faf06..4d72a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,9 +11,10 @@ Bugs
 * Downgraded Pango et al. back to 3.0.9 from 3.1.0 because there are bugs in the new gobject-introspection library.
 
 Chores:
-* Shrank the gem itself by ignoring test data. From about 5mb to 130kb - yay!
+* Shrank the gem itself by ignoring test data. From about 5mb to 64kb - yay!
 * Bump roo to newest version (2.7.0).
 * Bumped Nokogiri to latest version (1.7.0).
+* Re-organized the samples folder for better regression and sanity testing prior to release.
 
 ## v0.12.0 / 2016-12-02
 
diff --git a/squib.gemspec b/squib.gemspec
index c146049..162b293 100644
--- a/squib.gemspec
+++ b/squib.gemspec
@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.
                        split("\x0").
-                       reject { |f| f.match(%r{^(spec|samples)/}) }
+                       reject { |f| f.match(%r{^(spec|samples|docs|benchmarks)/}) }
   spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(spec|samples)\//)
+  spec.test_files    = spec.files.grep(/^(spec|samples|docs|benchmarks)\//)
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'cairo',                 '~> 1.15.3'