diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.10/pkg-plist b/lang/perl5.10/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.10/pkg-plist
+++ b/lang/perl5.10/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.12/pkg-plist b/lang/perl5.12/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.12/pkg-plist
+++ b/lang/perl5.12/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.14/pkg-plist b/lang/perl5.14/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.14/pkg-plist
+++ b/lang/perl5.14/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.16/pkg-plist b/lang/perl5.16/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.16/pkg-plist
+++ b/lang/perl5.16/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.6/pkg-plist b/lang/perl5.6/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.6/pkg-plist
+++ b/lang/perl5.6/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5.8/pkg-plist b/lang/perl5.8/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5.8/pkg-plist
+++ b/lang/perl5.8/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 28ec8675e6a2..3982ac9c2780 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 	-Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
 	-Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
 	-Dsitearch=${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
-	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
+	-Dsitelib=${PREFIX}/lib/perl5/site_perl/${PERL_VER} \
+	-Ui_gdbm
 INSTALLS_SHLIB=	yes
 
 INCLUDEDIR=	/usr/include
@@ -81,7 +82,7 @@ MAN3=	AnyDBM_File.3 AutoLoader.3 AutoSplit.3 B.3 B::Asmdata.3 \
 	File::Spec::Functions.3 File::Spec::Mac.3 File::Spec::OS2.3 \
 	File::Spec::Unix.3 File::Spec::VMS.3 File::Spec::Win32.3 \
 	File::Temp.3 File::stat.3 FileCache.3 FileHandle.3 FindBin.3 \
-	GDBM_File.3 Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
+	Getopt::Long.3 Getopt::Std.3 I18N::Collate.3 \
 	IO.3 IO::Dir.3 IO::File.3 IO::Handle.3 IO::Pipe.3 IO::Poll.3 \
 	IO::Seekable.3 IO::Select.3 IO::Socket.3 IO::Socket::INET.3 \
 	IO::Socket::UNIX.3 IPC::Msg.3 IPC::Open2.3 IPC::Open3.3 \
diff --git a/lang/perl5/pkg-plist b/lang/perl5/pkg-plist
index 16b419639c18..00b454a19b9d 100644
--- a/lang/perl5/pkg-plist
+++ b/lang/perl5/pkg-plist
@@ -282,7 +282,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/DynaLoader.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Errno.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/Fcntl.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/File/Glob.pm
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/GDBM_File.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/Dir.pm
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/IO/File.pm
@@ -331,9 +330,6 @@ lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/Fcntl/Fcntl.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/Glob.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/File/Glob/autosplit.ix
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.bs
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/GDBM_File.so
-lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File/autosplit.ix
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.bs
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IO/IO.so
 lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/IPC/SysV/SysV.bs