diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index bbeaf90..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,31 +0,0 @@
-.yardopts
-LICENSE
-MANIFEST
-README.md
-doc/DCO.md
-doc/changelog.md
-doc/css/common.css
-ext/c/extconf.rb
-ext/c/lexer.c
-ext/c/lexer.h
-ext/c/lexer.rl
-ext/c/liboga.c
-ext/c/liboga.h
-ext/java/LibogaService.java
-ext/java/org/liboga/xml/Lexer.java
-ext/java/org/liboga/xml/Lexer.rl
-lib/oga.rb
-lib/oga/html/parser.rb
-lib/oga/version.rb
-lib/oga/xml/cdata.rb
-lib/oga/xml/comment.rb
-lib/oga/xml/doctype.rb
-lib/oga/xml/document.rb
-lib/oga/xml/element.rb
-lib/oga/xml/lexer.rb
-lib/oga/xml/node.rb
-lib/oga/xml/parser.rb
-lib/oga/xml/pull_parser.rb
-lib/oga/xml/text.rb
-lib/oga/xml/xml_declaration.rb
-oga.gemspec
diff --git a/Rakefile b/Rakefile
index ec5c2b2..ab553c4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,18 +32,6 @@ CLEAN.include(
   'ext/java/org/liboga/xml/Lexer.java'
 )
 
-FILE_LIST = FileList.new(
-  'checkum/**/*.*',
-  'doc/**/*.*',
-  'lib/**/*.rb',
-  'LICENSE',
-  'MANIFEST',
-  '*.gemspec',
-  'README.md',
-  '.yardopts',
-  'ext/**/*.*'
-)
-
 Dir['./task/*.rake'].each do |task|
   import(task)
 end
diff --git a/oga.gemspec b/oga.gemspec
index 01a265c..ad4e035 100644
--- a/oga.gemspec
+++ b/oga.gemspec
@@ -10,7 +10,17 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.license     = 'MIT'
 
-  s.files = File.read(File.expand_path('../MANIFEST', __FILE__)).split("\n")
+  s.files = Dir.glob([
+    'checkum/**/*.*',
+    'doc/**/*.*',
+    'lib/**/*.rb',
+    'ext/**/*.*',
+    'README.md',
+    'LICENSE',
+    'MANIFEST',
+    'oga.gemspec',
+    '.yardopts'
+  ])
 
   if RUBY_PLATFORM == 'java'
     s.files << 'lib/liboga.jar'
diff --git a/task/manifest.rake b/task/manifest.rake
deleted file mode 100644
index 4f79742..0000000
--- a/task/manifest.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-desc 'Generates the MANIFEST file'
-task :manifest => [:generate] do
-  files  = FILE_LIST.to_a.sort
-  handle = File.open(File.expand_path('../../MANIFEST', __FILE__), 'w')
-
-  handle.write(files.join("\n"))
-  handle.close
-end