diff --git a/Module-Build-0.36.tar.bz2 b/Module-Build-0.36.tar.bz2
deleted file mode 100644
index 6a2d076..0000000
--- a/Module-Build-0.36.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f638da9bac841f2178dfa541d6c4231fc78a7eaffc61752583e9c1741012d632
-size 186160
diff --git a/Module-Build-0.3607.tar.bz2 b/Module-Build-0.3607.tar.bz2
new file mode 100644
index 0000000..946dfd9
--- /dev/null
+++ b/Module-Build-0.3607.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c701d35d16a5a8a1f717be6ff15ab2b9b35195b9a7439910eb7ca5c30edf2ab
+size 187068
diff --git a/perl-Module-Build.changes b/perl-Module-Build.changes
index d58b949..14dc94d 100644
--- a/perl-Module-Build.changes
+++ b/perl-Module-Build.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Dec  3 07:46:55 UTC 2010 - seife@opensuse.org
+
+- change version to 0.36.07 to prevent rpm version compare problems
+
+-------------------------------------------------------------------
+Thu Dec  2 15:35:10 UTC 2010 - seife@opensuse.org
+
+- fix conflict of config_data with the perl-supplied one by
+  renaming it to config_data-${version}
+
+-------------------------------------------------------------------
+Thu Dec  2 15:03:31 UTC 2010 - seife@opensuse.org
+
+- update to 0.3607. Fixes:
+  - The 'dist' action now always ensures a clean dist directory
+    before creating the tarball
+  - Added missing newline to "Changing sharpbang" messages under
+    verbose output (RT#54474)
+  - Support anonymous array of directories for c_source
+  - Small POD formatting fix
+  - Module::Build::Compat would croak on distibutions that set
+    requires 'perl' to a dotted decimal like '5.6.2'.
+  - When the currently running Module::Build is not the same as the
+    one that created the Build file, there is now a warning rather
+    than a fatal error.
+
 -------------------------------------------------------------------
 Wed Dec  1 13:33:42 UTC 2010 - coolo@novell.com
 
diff --git a/perl-Module-Build.spec b/perl-Module-Build.spec
index 2df8292..8ffb9e3 100644
--- a/perl-Module-Build.spec
+++ b/perl-Module-Build.spec
@@ -20,15 +20,18 @@
 Name:           perl-Module-Build
 %define cpan_name Module-Build
 Summary:        Build and install Perl modules
-Version:        0.36
+Version:        0.36.07
+%define _version 0.3607
 Release:        1
 License:        GPL+ or Artistic
 Group:          Development/Libraries/Perl
 Url:            http://search.cpan.org/dist/Module-Build/
 #Source:         http://www.cpan.org/modules/by-module/Module/Module-Build-%{version}.tar.gz
-Source:         %{cpan_name}-%{version}.tar.bz2
+Source:         %{cpan_name}-%{_version}.tar.bz2
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-%{_version}-build
+# for rename
+BuildRequires:  util-linux
 BuildRequires:  perl
 BuildRequires:  perl(Module::Build)
 %if 0%{?suse_version} < 1120
@@ -108,7 +111,7 @@ Authors:
     Ken Williams <kwilliams@cpan.org>
 
 %prep
-%setup -q -n %{cpan_name}-%{version}
+%setup -q -n %{cpan_name}-%{_version}
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -120,6 +123,9 @@ Authors:
 
 %install
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+# avoid conflict with Perl's own supplied version
+mv %{buildroot}/usr/bin/config_data %{buildroot}/usr/bin/config_data-%{_version}
+rename config_data config_data-%{_version} %{buildroot}/%{_mandir}/man1/config_data.*
 %perl_gen_filelist
 
 %clean