diff --git a/whrlpool.cpp b/whrlpool.cpp
index a510ba79..e0e401cc 100644
--- a/whrlpool.cpp
+++ b/whrlpool.cpp
@@ -1,8 +1,7 @@
-// whrlpool.cpp - originally modified by Kevin Springle from
-// Paulo Barreto and Vincent Rijmen's public domain code, whirlpool.c.
-// Updated to Whirlpool version 3.0, optimized and SSE version added by Wei Dai
-// All modifications are placed in the public domain
-
+// whrlpool.cpp - originally modified by Kevin Springle from Paulo Barreto and Vincent Rijmen's
+//                public domain code, whirlpool.c. Updated to Whirlpool version 3.0, optimized
+//                and SSE version added by WD. All modifications are placed in the public domain.
+//
 // This is the original introductory comment:
 
 /**
diff --git a/whrlpool.h b/whrlpool.h
index 3a32731f..8d08c763 100644
--- a/whrlpool.h
+++ b/whrlpool.h
@@ -1,12 +1,25 @@
+// whrlpool.h - originally modified by Kevin Springle from Paulo Barreto and Vincent Rijmen's
+//              public domain code, whirlpool.c. Updated to Whirlpool version 3.0, optimized
+//              and SSE version added by WD. All modifications are placed in the public domain.
+
 #ifndef CRYPTOPP_WHIRLPOOL_H
 #define CRYPTOPP_WHIRLPOOL_H
 
+/// \file whrlpool.h
+/// \brief Classes for the Whirlpool message digest
+/// \details Crypto++ provides version 3.0 of the Whirlpool algorithm.
+///   This version of the algorithm was submitted for ISO standardization.
+
 #include "config.h"
 #include "iterhash.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 
-/// <a href="http://www.cryptolounge.org/wiki/Whirlpool">Whirlpool</a>
+/// \brief Whirlpool message digest
+/// \details Crypto++ provides version 3.0 of the Whirlpool algorithm.
+///   This version of the algorithm was submitted for ISO standardization.
+/// \since Crypto++ 5.2
+/// \sa <a href="http://www.cryptopp.com/wiki/Whirlpool">Whirlpool</a>
 class Whirlpool : public IteratedHashWithStaticTransform<word64, BigEndian, 64, 64, Whirlpool>
 {
 public: