diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
index f87999fcee17..07faffedc66c 100644
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
+++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Parse/Build Peer Packets from BitTorrent
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN3=		Net::BitTorrent::PeerPacket.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
index 111dcaa3edc7..10922a4156bd 100644
--- a/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent-PeerPacket/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Net::BitTorrent::PeerPacket.3.gz
 %%SITE_PERL%%/Net/BitTorrent/PeerPacket.pm
 @dirrmtry %%SITE_PERL%%/Net/BitTorrent
 @dirrmtry %%SITE_PERL%%/Net
diff --git a/net-p2p/p5-Net-BitTorrent/Makefile b/net-p2p/p5-Net-BitTorrent/Makefile
index 7677528f62c9..edc9a877ac12 100644
--- a/net-p2p/p5-Net-BitTorrent/Makefile
+++ b/net-p2p/p5-Net-BitTorrent/Makefile
@@ -20,21 +20,5 @@ PORTSCOUT=	skipv:0.074000_012
 USES=		perl5
 USE_PERL5=	modbuild
 
-MAN1=		net-bittorrent.pl.1
-MAN3=		Net::BitTorrent.3 \
-		Net::BitTorrent::Notes.3 \
-		Net::BitTorrent::ConfigData.3 \
-		Net::BitTorrent::DHT.3 \
-		Net::BitTorrent::Peer.3 \
-		Net::BitTorrent::Protocol.3 \
-		Net::BitTorrent::Torrent.3 \
-		Net::BitTorrent::Torrent::File.3 \
-		Net::BitTorrent::Torrent::Tracker.3 \
-		Net::BitTorrent::Torrent::Tracker::HTTP.3 \
-		Net::BitTorrent::Torrent::Tracker::UDP.3 \
-		Net::BitTorrent::Util.3 \
-		Net::BitTorrent::Version.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
 
diff --git a/net-p2p/p5-Net-BitTorrent/pkg-plist b/net-p2p/p5-Net-BitTorrent/pkg-plist
index 71bfecf062b9..96b83e012a29 100644
--- a/net-p2p/p5-Net-BitTorrent/pkg-plist
+++ b/net-p2p/p5-Net-BitTorrent/pkg-plist
@@ -1,4 +1,17 @@
 bin/net-bittorrent.pl
+%%PERL5_MAN3%%/Net::BitTorrent.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::ConfigData.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::DHT.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Notes.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Peer.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Protocol.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Torrent.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Torrent::File.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker::HTTP.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Torrent::Tracker::UDP.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Util.3.gz
+%%PERL5_MAN3%%/Net::BitTorrent::Version.3.gz
 %%SITE_PERL%%/Net/BitTorrent.pm
 %%SITE_PERL%%/Net/BitTorrent/ConfigData.pm
 %%SITE_PERL%%/Net/BitTorrent/DHT.pm
@@ -12,6 +25,7 @@ bin/net-bittorrent.pl
 %%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker/UDP.pm
 %%SITE_PERL%%/Net/BitTorrent/Util.pm
 %%SITE_PERL%%/Net/BitTorrent/Version.pm
+man/man1/net-bittorrent.pl.1.gz
 @dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent/Tracker
 @dirrmtry %%SITE_PERL%%/Net/BitTorrent/Torrent
 @dirrmtry %%SITE_PERL%%/Net/BitTorrent