diff --git a/Manifest.txt b/Manifest.txt
index 7e8b83ef7c6..b180fdf2d7b 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -1,25 +1,7 @@
-.autotest
-.cross_rubies
-.editorconfig
-.gemtest
-.travis.yml
-CHANGELOG.md
-CONTRIBUTING.md
-C_CODING_STYLE.rdoc
-Gemfile
-Gemfile-libxml-ruby
 LICENSE-DEPENDENCIES.md
 LICENSE.md
-Manifest.txt
 README.md
-ROADMAP.md
-Rakefile
-SECURITY.md
-STANDARD_RESPONSES.md
-Y_U_NO_GEMSPEC.md
-appveyor.yml
 bin/nokogiri
-build_all
 dependencies.yml
 ext/java/nokogiri/EncodingHandler.java
 ext/java/nokogiri/HtmlDocument.java
@@ -256,6 +238,7 @@ patches/libxml2/0003-Fix-infinite-loop-in-LZMA-decompression.patch
 patches/sort-patches-by-date
 suppressions/README.txt
 suppressions/nokogiri_ruby-2.supp
+<<<<<<< HEAD
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
@@ -368,3 +351,5 @@ test/xml/test_xinclude.rb
 test/xml/test_xpath.rb
 test/xslt/test_custom_functions.rb
 test/xslt/test_exception_handling.rb
+=======
+>>>>>>> Make builds minimal
diff --git a/Rakefile b/Rakefile
index 86a75cdb87a..8a5118ae1ef 100644
--- a/Rakefile
+++ b/Rakefile
@@ -115,8 +115,7 @@ HOE = Hoe.spec 'nokogiri' do
   self.readme_file  = "README.md"
   self.history_file = "CHANGELOG.md"
 
-  self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
-
+  self.extra_rdoc_files = FileList['ext/nokogiri/*.c']
 
   self.clean_globs += [
     'nokogiri.gemspec',