diff --git a/math/p5-Math-GMPz/Makefile b/math/p5-Math-GMPz/Makefile
index eef1844e22e..3fe6ba471ce 100644
--- a/math/p5-Math-GMPz/Makefile
+++ b/math/p5-Math-GMPz/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	perl interface to GMP integer functions
 
 MODULES =	cpan
-DISTNAME =	Math-GMPz-0.51
+DISTNAME =	Math-GMPz-0.55
 CATEGORIES =	math
 
 # Perl
@@ -17,7 +17,8 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 TEST_DEPENDS =	math/p5-Math-BigInt-GMP \
-		math/p5-Math-GMPf
+		math/p5-Math-GMPf \
+		devel/p5-Test-Warn
 
 MAKE_ENV +=	TEST_POD=Yes
 
diff --git a/math/p5-Math-GMPz/distinfo b/math/p5-Math-GMPz/distinfo
index b6be2fa7c37..7b4c926fc15 100644
--- a/math/p5-Math-GMPz/distinfo
+++ b/math/p5-Math-GMPz/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Math-GMPz-0.51.tar.gz) = TOoaA+UAvzWooMxiVFCxe0R34bzyurE331Zwv7UUY1M=
-SIZE (Math-GMPz-0.51.tar.gz) = 90329
+SHA256 (Math-GMPz-0.55.tar.gz) = zeeeumvsCcHuDtXC41HpQLBn1TAVjM0alu0QJebd23k=
+SIZE (Math-GMPz-0.55.tar.gz) = 99085
diff --git a/math/p5-Math-GMPz/patches/patch-Makefile_PL b/math/p5-Math-GMPz/patches/patch-Makefile_PL
index 447df393f58..a8f81ec649c 100644
--- a/math/p5-Math-GMPz/patches/patch-Makefile_PL
+++ b/math/p5-Math-GMPz/patches/patch-Makefile_PL
@@ -1,12 +1,12 @@
 Index: Makefile.PL
 --- Makefile.PL.orig
 +++ Makefile.PL
-@@ -74,9 +74,8 @@ my %options = (
+@@ -117,9 +117,8 @@ my %options = (
    ABSTRACT => 'Perl interface to the GMP integer functions',
    DEFINE   => $defines,
  
 -  LIBS => [
--    '-lgmp'
+-    $libopts
 -  ],
 +  INC  => "$ENV{CPPFLAGS}",
 +  LIBS => ["$ENV{LDFLAGS} -lgmp"],
diff --git a/math/p5-Math-GMPz/patches/patch-Random_Makefile_PL b/math/p5-Math-GMPz/patches/patch-Random_Makefile_PL
index 16afdd7295a..67dadbb614b 100644
--- a/math/p5-Math-GMPz/patches/patch-Random_Makefile_PL
+++ b/math/p5-Math-GMPz/patches/patch-Random_Makefile_PL
@@ -1,13 +1,14 @@
 Index: Random/Makefile.PL
 --- Random/Makefile.PL.orig
 +++ Random/Makefile.PL
-@@ -10,7 +10,8 @@ my %options = %{
+@@ -11,8 +11,8 @@ my %options = %{
      '../typemap'
    ],
-   'NAME' => 'Math::GMPz::Random',
--  'LIBS' => $LIBS,
-+   INC  => "$ENV{CPPFLAGS}",
-+   LIBS => ["$ENV{LDFLAGS} -lgmp"],
-   'INC' => $INC,
+   'NAME'         => 'Math::GMPz::Random',
+-  'LIBS'         => $LIBS,
+-  'INC'          => $INC,
++  'LIBS'         => ["$ENV{LDFLAGS} -lgmp"],
++  'INC'          => "$ENV{CPPFLAGS}",
+   'DEFINE'       => $DEFS,
    'VERSION_FROM' => 'Random.pm'
  }