diff --git a/Build.PL b/Build.PL
new file mode 100644
index 0000000..1f526b6
--- /dev/null
+++ b/Build.PL
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+use strict;
+use Module::Build;
+
+Module::Build->new( module_name => 'File::DirWalk',
+                    author      => 'jens.luedicke@gmail.com',
+                    license     => 'perl',
+                    requires    => {'Test::Simple' => '0.72'},
+                    sign        => 1,
+                    create_makefile_pl => 'traditional',
+                  )->create_build_script;
diff --git a/MANIFEST b/MANIFEST
index e0402b4..6177ad5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,5 @@
-DirWalk.pm
+lib/File/DirWalk.pm
 MANIFEST
 META.yml
-Makefile.PL
 README
-configure
 t/1.t
diff --git a/META.yml b/META.yml
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile.PL b/Makefile.PL
deleted file mode 100644
index 29886a8..0000000
--- a/Makefile.PL
+++ /dev/null
@@ -1,14 +0,0 @@
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-	'NAME'		=> 'File::DirWalk',
-	'VERSION_FROM'	=> 'DirWalk.pm',
-	'PREREQ_PM'	=> {
-		'File::Basename' => 0,
-		'File::Spec' => 0,
-	}, 
-	($] >= 5.005
-		? (AUTHOR     => 'Jens Luedicke <jensl@cpan.org>') 
-		: ()
-	),
-);
diff --git a/configure b/configure
deleted file mode 100755
index 60053c3..0000000
--- a/configure
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec perl ./Makefile.PL "$@"
diff --git a/DirWalk.pm b/lib/File/DirWalk.pm
similarity index 99%
rename from DirWalk.pm
rename to lib/File/DirWalk.pm
index b1b10d5..901db83 100644
--- a/DirWalk.pm
+++ b/lib/File/DirWalk.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2005-2006 Jens Luedicke <jensl@cpan.org>. All rights reserved.
+# Copyright (c) 2005-2010 Jens Luedicke <jensl@cpan.org>. All rights reserved.
 # This program is free software; you can redistribute it and/or
 # modify it under the same terms as Perl itself.