diff --git a/src/servers/registrar/ClipboardHandler.cpp b/src/servers/registrar/ClipboardHandler.cpp
index b798b05b13..3c827d1606 100644
--- a/src/servers/registrar/ClipboardHandler.cpp
+++ b/src/servers/registrar/ClipboardHandler.cpp
@@ -4,18 +4,31 @@
 
 #include "ClipboardHandler.h"
 
+/*!
+	\class ClipboardHandler
+	\brief Handles all clipboard related requests.
+*/
+
 // constructor
+/*!	\brief Creates and initializes a ClipboardHandler.
+*/
 ClipboardHandler::ClipboardHandler()
 				: BHandler()
 {
 }
 
 // destructor
+/*!	\brief Frees all resources associate with this object.
+*/
 ClipboardHandler::~ClipboardHandler()
 {
 }
 
 // MessageReceived
+/*!	\brief Overrides the super class version to handle the clipboard specific
+		   messages.
+	\param message The message to be handled
+*/
 void
 ClipboardHandler::MessageReceived(BMessage *message)
 {
diff --git a/src/servers/registrar/MIMEManager.cpp b/src/servers/registrar/MIMEManager.cpp
index 47f2d01a41..b229697e58 100644
--- a/src/servers/registrar/MIMEManager.cpp
+++ b/src/servers/registrar/MIMEManager.cpp
@@ -4,18 +4,33 @@
 
 #include "MIMEManager.h"
 
+/*!
+	\class MIMEManager
+	\brief MIMEManager is the master of the MIME data base.
+
+	All write and non-atomic read accesses are carried out by this class.
+*/
+
 // constructor
+/*!	\brief Creates and initializes a MIMEManager.
+*/
 MIMEManager::MIMEManager()
 		   : BLooper("main_mime")
 {
 }
 
 // destructor
+/*!	\brief Frees all resources associate with this object.
+*/
 MIMEManager::~MIMEManager()
 {
 }
 
 // MessageReceived
+/*!	\brief Overrides the super class version to handle the MIME specific
+		   messages.
+	\param message The message to be handled
+*/
 void
 MIMEManager::MessageReceived(BMessage *message)
 {