diff --git a/lang/perl/perl-html-form/Makefile b/lang/perl/perl-html-form/Makefile
index 04cc0846a9..de7020715b 100644
--- a/lang/perl/perl-html-form/Makefile
+++ b/lang/perl/perl-html-form/Makefile
@@ -1,48 +1,45 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=perl-html-form
-PKG_VERSION:=6.07
+PKG_VERSION:=6.12
 PKG_RELEASE:=1
 
-PKG_SOURCE:=HTML-Form-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/O/OA/OALDERS
-PKG_HASH:=7daa8c7eaff4005501c3431c8bf478d58bbee7b836f863581aa14afe1b4b6227
-PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Form-$(PKG_VERSION)
+METACPAN_NAME:=HTML-Form
+METACPAN_AUTHOR:=OALDERS
+PKG_HASH:=2ced87d0878afa007d22c41927f0e8da63844608f20881f645f364dc32cdce6f
 
-PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
+PKG_MAINTAINER:=Jens Wagner <jens@wagner2013.de>
 PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=LICENSE
 
+include ../metacpan.mk
 include $(INCLUDE_DIR)/package.mk
-include ../perl/perlmod.mk
+include ../perlmod.mk
 
 define Package/perl-html-form
   SUBMENU:=Perl
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Class that represents an HTML form element
-  URL:=https://search.cpan.org/dist/HTML-Form/
-  DEPENDS:=perl +perl-html-parser +perl-http-message +perl-uri +perlbase-encode +perlbase-essential
+  URL:=https://metacpan.org/pod/HTML::Form
+  DEPENDS:=perl +perlbase-encode +perlbase-essential +perl-html-parser +perl-http-message +perl-uri
+endef
+
+define Package/perl-html-form/description
+  Objects of the HTML::Form class represents a single HTML
+  <form> ... </form> instance.
 endef
 
 define Build/Configure
-        $(call perlmod/Configure,,)
+    $(call perlmod/Configure,,)
 endef
 
 define Build/Compile
-        $(call perlmod/Compile,,)
+    $(call perlmod/Compile,,)
 endef
 
 define Package/perl-html-form/install
-        $(call perlmod/Install,$(1),HTML auto/HTML)
+    $(call perlmod/Install,$(1),HTML)
 endef
 
-
 $(eval $(call BuildPackage,perl-html-form))