diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 67bbdf89a2..dc794b0538 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -36,6 +36,37 @@
 #include "libavutil/rational.h"
 
 #include "libavcodec/version.h"
+/**
+ * @defgroup libavc Encoding/Decoding Library
+ * @{
+ *
+ * @defgroup lavc_decoding Decoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_encoding Encoding
+ * @{
+ * @}
+ *
+ * @defgroup lavc_codec Codecs
+ * @{
+ * @defgroup lavc_codec_native Native Codecs
+ * @{
+ * @}
+ * @defgroup lavc_codec_wrappers External library wrappers
+ * @{
+ * @}
+ * @defgroup lavc_codec_hwaccel Hardware Accelerators bridge
+ * @{
+ * @}
+ * @}
+ * @defgroup lavc_internal Internal
+ * @{
+ * @}
+ * @}
+ *
+ */
+
 
 /**
  * Identify the syntax and semantics of the bitstream.
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 659a10f070..a1a9c38c8a 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -34,7 +34,7 @@
  * This document describe the usage of the different libraries
  * provided by Libav.
  *
- * @li @subpage libavcodec  encoding/decoding library
+ * @li @ref libavc "libavcodec" encoding/decoding library
  * @li @subpage libavfilter graph based frame editing library
  * @li @subpage libavformat I/O and muxing/demuxing library
  * @li @ref lavu "libavutil" common utility library