diff --git a/Module-Info-0.35.tar.gz b/Module-Info-0.35.tar.gz
deleted file mode 100644
index 660ea45..0000000
--- a/Module-Info-0.35.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab073d10d67a25b0e6a3f8efa95de9e3d6fbe043538bf524a88a0e1fc3ebfb64
-size 55112
diff --git a/Module-Info-0.36.tar.gz b/Module-Info-0.36.tar.gz
new file mode 100644
index 0000000..253195b
--- /dev/null
+++ b/Module-Info-0.36.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e291d2748c5a02843d63a019b56b6c523552ef3af89c9d6489f5bbbc0cf65c07
+size 42456
diff --git a/cpanspec.yml b/cpanspec.yml
new file mode 100644
index 0000000..9b7ec50
--- /dev/null
+++ b/cpanspec.yml
@@ -0,0 +1,23 @@
+---
+#description_paragraphs: 3
+#no_testing: broken upstream
+#sources:
+#  - source1
+#  - source2
+#patches:
+#  foo.patch: -p1
+#  bar.patch:
+#preamble: |-
+# BuildRequires:  gcc-c++
+#post_prep: |-
+# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s,  *,,g'`
+# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL 
+#post_install: |-
+# sed on %{name}.files
+#license: SUSE-NonFree
+#skip_noarch: 1
+#custom_build: |-
+#./Build build flags=%{?_smp_mflags} --myflag
+#custom_test: |-
+#startserver && make test
+#ignore_requires: Bizarre::Module
diff --git a/fix_provides.diff b/fix_provides.diff
deleted file mode 100644
index 4963ccb..0000000
--- a/fix_provides.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: Module-Info-0.32/lib/B/BUtils.pm
-===================================================================
---- Module-Info-0.32.orig/lib/B/BUtils.pm	2008-10-25 00:49:59.000000000 +0200
-+++ Module-Info-0.32/lib/B/BUtils.pm	2011-04-05 13:33:14.631098544 +0200
-@@ -1,5 +1,6 @@
- # forked version of B::Utils; needs to merge it ASAP
--package B::Utils;
-+package 
-+  B::Utils;
- 
- use 5.006;
- use warnings;
-@@ -487,7 +488,8 @@ sub opgrep {
-     return @rv;
- }
- 
--package B::BUtils;
-+package 
-+ B::BUtils;
- 
- @ISA = qw(B::Utils);
- 
-Index: Module-Info-0.32/lib/B/Module/Info.pm
-===================================================================
---- Module-Info-0.32.orig/lib/B/Module/Info.pm	2008-10-25 00:49:59.000000000 +0200
-+++ Module-Info-0.32/lib/B/Module/Info.pm	2011-04-05 13:32:46.855321516 +0200
-@@ -1,4 +1,5 @@
--package B::Module::Info;
-+package 
-+  B::Module::Info;
- 
- $VERSION = '0.24';
- 
diff --git a/perl-Module-Info.changes b/perl-Module-Info.changes
index 2745b9c..bb793fd 100644
--- a/perl-Module-Info.changes
+++ b/perl-Module-Info.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Sat Oct 24 09:14:19 UTC 2015 - coolo@suse.com
+
+- updated to 0.36
+   see /usr/share/doc/packages/perl-Module-Info/Changes
+
+  0.36 2015-10-23 NEILB
+      - Dropped our own fork of B::Utils, now rely on CPAN one - RT#13524
+      - Now works on recent versions of Perl - RT#97105
+      - Pod tests not run on installation - RT#90599
+  - obsoletes fix_provides.diff
+  
+  0.35_07 2015-10-19 NEILB
+      - I had missed another instance of "the Windows cwd() issue" affecting
+        t/n1_modules_required.t
+  
+  0.35_06 2015-10-17 NEILB
+      - Added "use strict" to both modules
+      - Made the pod coverage test a release test RT#90599
+      - Added MIN_PERL_VERSION to Makefile.PL
+      - Added a basic README
+  
+  0.35_05 2015-10-16 NEILB
+      - Had a single failure reported by CPAN Testers for Perl 5.22/Windows.
+        On Windows, if you "use Cwd" and then call cwd(), then it does an
+        implicit "use Win32". On recent perls (sometime after 5.20.1) this
+        seems to get built into the op tree in a way that looks like the
+        scope doing the cwd() use'd Win32. There are several magic functions
+        in Cwd.pm which will probably trigger this behaviour. I'll see how this
+        change tests out, and possibly just document it for a non dev release.
+  
+  0.35_04 2015-10-14 NEILB
+      - Sigh, forgot to update the min version of B::Utils in Makefile.PL
+        Thanks to SREZIC for letting me know.
+  
+  0.35_03 2015-10-13 NEILB
+      - Removed File::Spec from t/lib/
+      - Set min required version of B::Utils to 0.27, as that release fixes
+        the remaining failing tests.
+      - Hacked const_sv() to cope with the change in OP_METHOD_NAMED
+        that happened at 5.21.5 (or possibly an earlier 5.21.*).
+  
+  0.35_02 2015-06-15 NEILB
+      - Sigh, forgot to add B::Utils to PREREQ_PM
+  
+  0.35_01 2015-06-15 NEILB
+      - Dropped B::BUtils in favour of using the standard B::Utils.
+        subroutines_called() stopped working correctly for standard function
+        calls, identifying them as calls via symbolic references. Fixed that.
+      - Dropped Build.PL
+
 -------------------------------------------------------------------
 Sun Jul 20 07:25:16 UTC 2014 - coolo@suse.com
 
diff --git a/perl-Module-Info.spec b/perl-Module-Info.spec
index 1f6c4e4..1c9e760 100644
--- a/perl-Module-Info.spec
+++ b/perl-Module-Info.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package perl-Module-Info
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,21 @@
 
 
 Name:           perl-Module-Info
-Version:        0.35
+Version:        0.36
 Release:        0
 %define cpan_name Module-Info
 Summary:        Information about Perl modules
 License:        Artistic-1.0 or GPL-1.0+
 Group:          Development/Libraries/Perl
 Url:            http://search.cpan.org/dist/Module-Info/
-Source:         http://www.cpan.org/authors/id/M/MB/MBARBON/%{cpan_name}-%{version}.tar.gz
-Patch0:         fix_provides.diff
+Source0:        http://www.cpan.org/authors/id/N/NE/NEILB/%{cpan_name}-%{version}.tar.gz
+Source1:        cpanspec.yml
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
 BuildRequires:  perl-macros
-BuildRequires:  perl(Module::Build) >= 0.40
+BuildRequires:  perl(B::Utils) >= 0.27
+Requires:       perl(B::Utils) >= 0.27
 %{perl_requires}
 
 %description
@@ -40,21 +41,21 @@ on any perl code.
 
 %prep
 %setup -q -n %{cpan_name}-%{version}
-%patch0 -p1
 
 %build
-%{__perl} Build.PL installdirs=vendor
-./Build build flags=%{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
 
 %check
-./Build test
+%{__make} test
 
 %install
-./Build install destdir=%{buildroot} create_packlist=0
+%perl_make_install
+%perl_process_packlist
 %perl_gen_filelist
 
 %files -f %{name}.files
 %defattr(-,root,root,755)
-%doc Changes
+%doc Changes README
 
 %changelog