diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile
index 0a829a0fc6f6..a1536de2b749 100644
--- a/net-mgmt/ipplan/Makefile
+++ b/net-mgmt/ipplan/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ipplan
-PORTVERSION=	4.58
+PORTVERSION=	4.80b
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	iptrack
-DISTNAME=	${PORTNAME}-4.58
 
 MAINTAINER=	mt@primats.org.ua
 COMMENT=	IP address management and tracking
diff --git a/net-mgmt/ipplan/distinfo b/net-mgmt/ipplan/distinfo
index f4e8a47ed9e0..f8d440745da3 100644
--- a/net-mgmt/ipplan/distinfo
+++ b/net-mgmt/ipplan/distinfo
@@ -1,3 +1,3 @@
-MD5 (ipplan-4.58.tar.gz) = e8707b1683521478c42597668eed631d
-SHA256 (ipplan-4.58.tar.gz) = d601111b3332d3fcb694f436a1b43c60ccb41c52d635d96a6730645542aa8ffe
-SIZE (ipplan-4.58.tar.gz) = 1438869
+MD5 (ipplan-4.80b.tar.gz) = 7cead465bc4db19602c95ab5d1b5e2a0
+SHA256 (ipplan-4.80b.tar.gz) = 664918a294eb89af9080e1c4875ad9e3c8b18e51725250507787e6914006f99e
+SIZE (ipplan-4.80b.tar.gz) = 1453679
diff --git a/net-mgmt/ipplan/pkg-plist b/net-mgmt/ipplan/pkg-plist
index 2c3e38a4f908..f32bd37cfcf8 100644
--- a/net-mgmt/ipplan/pkg-plist
+++ b/net-mgmt/ipplan/pkg-plist
@@ -1,7 +1,6 @@
 @unexec if cmp -s %D/%%IPPLANDIR%%/config.php %D/%%IPPLANDIR%%/config.php.sample ; then rm -f %D/%%IPPLANDIR%%/config.php; fi
 %%IPPLANDIR%%/CHANGELOG
 %%IPPLANDIR%%/CONTRIBUTORS
-%%IPPLANDIR%%/DNS-USAGE
 %%IPPLANDIR%%/INSTALL
 %%IPPLANDIR%%/INSTALL-IIS+MSSQL
 %%IPPLANDIR%%/INSTALL-ORACLE9i
@@ -212,12 +211,14 @@
 %%IPPLANDIR%%/contrib/ipplan-poller.php
 %%IPPLANDIR%%/contrib/process-exports.pl
 %%IPPLANDIR%%/contrib/process-exports.txt
+%%IPPLANDIR%%/cookies.js
 %%IPPLANDIR%%/docu.css
 %%IPPLANDIR%%/gpl.html
 %%IPPLANDIR%%/images/square_green.jpg
 %%IPPLANDIR%%/images/square_orange.jpg
 %%IPPLANDIR%%/images/square_red.jpg
 %%IPPLANDIR%%/index.php
+%%IPPLANDIR%%/ipplanlib.js
 %%IPPLANDIR%%/ipplanlib.php
 %%IPPLANDIR%%/layout/class.layout
 %%IPPLANDIR%%/layout/layoutman.html
@@ -456,8 +457,15 @@
 %%IPPLANDIR%%/menus/templates/layersmenu-vertical_menu.ihtml
 %%IPPLANDIR%%/messages.po
 %%IPPLANDIR%%/phpmailer.lang-en.php
+%%IPPLANDIR%%/phpserializer.js
 %%IPPLANDIR%%/schema.php
-%%IPPLANDIR%%/templates/customer/custtemplate-ripe.xsl
+%%IPPLANDIR%%/templates/display/basetemplate.xml
+%%IPPLANDIR%%/templates/display/basetemplate.xml.dhcp
+%%IPPLANDIR%%/templates/display/custtemplate-ripe.xml
+%%IPPLANDIR%%/templates/display/custtemplate.xml
+%%IPPLANDIR%%/templates/display/fwdzonetemplate.xml
+%%IPPLANDIR%%/templates/display/iptemplate.xml
+%%IPPLANDIR%%/templates/display/iptemplate.xml.sample
 %%IPPLANDIR%%/templates/ripe_assign-simple-1.0.xsl
 %%IPPLANDIR%%/templates/ripe_person_simple-1.0.xsl
 %%IPPLANDIR%%/templates/swip_reassign-simple-modify3.0.xsl
@@ -466,6 +474,7 @@
 %%IPPLANDIR%%/templates/swip_wdb1.4_delete.xsl
 %%IPPLANDIR%%/templates/swip_wdb1.4_modify.xsl
 %%IPPLANDIR%%/templates/swip_wdb1.4_new.xsl
+%%IPPLANDIR%%/themes/default-safari.css
 %%IPPLANDIR%%/themes/default.css
 %%IPPLANDIR%%/themes/pastel.css
 %%IPPLANDIR%%/themes/penguin.css
@@ -476,6 +485,7 @@
 %%IPPLANDIR%%/user/Net/DNS/RR.php
 %%IPPLANDIR%%/user/Net/DNS/RR/A.php
 %%IPPLANDIR%%/user/Net/DNS/RR/AAAA.php
+%%IPPLANDIR%%/user/Net/DNS/RR/AFSDB.php
 %%IPPLANDIR%%/user/Net/DNS/RR/CNAME.php
 %%IPPLANDIR%%/user/Net/DNS/RR/HINFO.php
 %%IPPLANDIR%%/user/Net/DNS/RR/MX.php
@@ -487,13 +497,10 @@
 %%IPPLANDIR%%/user/Net/DNS/RR/TSIG.php
 %%IPPLANDIR%%/user/Net/DNS/RR/TXT.php
 %%IPPLANDIR%%/user/Net/DNS/Resolver.php
-%%IPPLANDIR%%/user/basetemplate.xml
-%%IPPLANDIR%%/user/basetemplate.xml.dhcp
 %%IPPLANDIR%%/user/createarea.php
 %%IPPLANDIR%%/user/createrange.php
 %%IPPLANDIR%%/user/createsubnet.php
 %%IPPLANDIR%%/user/createsubnetform.php
-%%IPPLANDIR%%/user/custtemplate.xml
 %%IPPLANDIR%%/user/deletearea.php
 %%IPPLANDIR%%/user/deletecustomer.php
 %%IPPLANDIR%%/user/deleterange.php
@@ -512,8 +519,6 @@
 %%IPPLANDIR%%/user/exportdhcp.php
 %%IPPLANDIR%%/user/findfree.php
 %%IPPLANDIR%%/user/findfreeform.php
-%%IPPLANDIR%%/user/iptemplate.xml
-%%IPPLANDIR%%/user/iptemplate.xml.sample
 %%IPPLANDIR%%/user/logout.php
 %%IPPLANDIR%%/user/modifyarearange.php
 %%IPPLANDIR%%/user/modifyarearangeform.php
@@ -543,9 +548,7 @@
 @dirrm %%IPPLANDIR%%/user/Net
 @dirrm %%IPPLANDIR%%/user
 @dirrm %%IPPLANDIR%%/themes
-@dirrm %%IPPLANDIR%%/templates/subnet
-@dirrm %%IPPLANDIR%%/templates/ipaddr
-@dirrm %%IPPLANDIR%%/templates/customer
+@dirrm %%IPPLANDIR%%/templates/display
 @dirrm %%IPPLANDIR%%/templates
 @dirrm %%IPPLANDIR%%/menus/templates
 @dirrm %%IPPLANDIR%%/menus/menuimages