diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 0c99c98b8053..303e5250e0ff 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libogg
-PORTVERSION=	1.3.0
+PORTVERSION=	1.3.1
 PORTEPOCH=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
@@ -10,12 +10,14 @@ MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Ogg bitstream library
 
+USES=		pathfix
 USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
-USES=	pathfix
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index 0dddc9974974..a046677aae34 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libogg-1.3.0.tar.gz) = a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780
-SIZE (libogg-1.3.0.tar.gz) = 425144
+SHA256 (libogg-1.3.1.tar.gz) = 4e343f07aa5a1de8e0fa1107042d472186b3470d846b20b115b964eba5bae554
+SIZE (libogg-1.3.1.tar.gz) = 552282
diff --git a/audio/libogg/files/patch-doc_Makefile.in b/audio/libogg/files/patch-doc_Makefile.in
deleted file mode 100644
index c1c74fb1e5ee..000000000000
--- a/audio/libogg/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	2009-07-06 19:33:18.000000000 +0200
-+++ doc/Makefile.in	2009-07-06 19:33:30.000000000 +0200
-@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/audio/libogg/files/patch-doc_libogg_Makefile.in b/audio/libogg/files/patch-doc_libogg_Makefile.in
deleted file mode 100644
index 65dad3656ee9..000000000000
--- a/audio/libogg/files/patch-doc_libogg_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/libogg/Makefile.in.orig	2009-07-06 19:33:41.000000000 +0200
-+++ doc/libogg/Makefile.in	2009-07-06 19:33:55.000000000 +0200
-@@ -144,7 +144,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
-+docdir = $(datadir)/doc/$(PACKAGE)/ogg
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/audio/libogg/pkg-descr b/audio/libogg/pkg-descr
index f04523a34e3e..883da5946a8b 100644
--- a/audio/libogg/pkg-descr
+++ b/audio/libogg/pkg-descr
@@ -1,7 +1,8 @@
-Ogg project codecs use the Ogg bitstream format to arrange the raw,
-compressed bitstream into a more robust, useful form.  For example,
-the Ogg bitstream makes seeking, time stamping and error recovery
-possible, as well as mixing several separate, concurrent media
-streams into a single physical bitstream.
+Ogg is a multimedia container format and the native file and stream
+format for the Xiph.org multimedia codecs.  It encapsulates raw
+compressed data and allows the interleaving of audio and video data
+inside a single convient format.  Ogg is a stream oriented container
+and provides packet framing, error detection, and periodic timestamps
+for seeking.
 
-WWW: http://www.xiph.org/ogg/
+WWW: https://www.xiph.org/ogg/
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index 3b082f07f15f..4feb6948acab 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -8,72 +8,82 @@ lib/libogg.so
 lib/libogg.so.8
 libdata/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
+%%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
 %%PORTDOCS%%%%DOCSDIR%%/framing.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/bitpacking.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/datastructures.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/decoding.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/encoding.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/general.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_iovec_t.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_packet.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_packet_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_bos.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_checksum_set.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_continued.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_eos.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_granulepos.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_packets.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_pageno.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_serialno.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_page_version.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_check.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_eos.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_flush.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_flush_fill.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_init.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_iovecin.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_packetin.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_packetout.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_packetpeek.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_pagein.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_pageout.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_pageout_fill.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_reset_serialno.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_stream_state.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_check.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_clear.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_init.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_pageout.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_pageseek.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_state.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/ogg_sync_wrote.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_adv.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_adv1.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_bits.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_bytes.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_get_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_look.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_look1.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_read.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_read1.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_readinit.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_reset.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_write.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writealign.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writecheck.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writeclear.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writecopy.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writeinit.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/oggpack_writetrunc.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/libogg/style.css
+%%PORTDOCS%%%%DOCSDIR%%/multiplex1.png
 %%PORTDOCS%%%%DOCSDIR%%/ogg-multiplex.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/bitpacking.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/datastructures.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/decoding.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/encoding.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/general.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_packet.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_packet_clear.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_bos.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_checksum_set.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_continued.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_eos.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_granulepos.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_packets.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_pageno.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_serialno.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_page_version.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_clear.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_destroy.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_eos.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_flush.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_init.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_packetin.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_packetout.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_packetpeek.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_pagein.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_pageout.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_pageout_fill.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_reset_serialno.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_stream_state.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_clear.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_destroy.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_init.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_pageout.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_pageseek.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_state.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/ogg_sync_wrote.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_adv.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_adv1.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_bits.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_bytes.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_get_buffer.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_look.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_look1.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_read.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_read1.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_readinit.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_reset.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_write.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writealign.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writeclear.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writecopy.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writeinit.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/oggpack_writetrunc.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/reference.html
-%%PORTDOCS%%%%DOCSDIR%%/ogg/style.css
 %%PORTDOCS%%%%DOCSDIR%%/oggstream.html
+%%PORTDOCS%%%%DOCSDIR%%/packets.png
+%%PORTDOCS%%%%DOCSDIR%%/pages.png
 %%PORTDOCS%%%%DOCSDIR%%/rfc3533.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc5334.txt
 %%PORTDOCS%%%%DOCSDIR%%/skeleton.html
@@ -82,5 +92,5 @@ share/aclocal/ogg.m4
 %%PORTDOCS%%%%DOCSDIR%%/white-ogg.png
 %%PORTDOCS%%%%DOCSDIR%%/white-xifish.png
 @dirrm include/ogg
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ogg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/libogg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%