diff --git a/ntfsprogs/dumplog.c b/ntfsprogs/dumplog.c
index 861f3a03..a1fa27ca 100644
--- a/ntfsprogs/dumplog.c
+++ b/ntfsprogs/dumplog.c
@@ -1,6 +1,4 @@
-const char *EXEC_NAME = "dumplog";
-const char *EXEC_VERSION = "1.0";
-/*
+/**
  * DumpLog - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2002 Anton Altaparmakov
@@ -9,8 +7,6 @@ const char *EXEC_VERSION = "1.0";
  * on the command line and display the results on stdout. Errors will be output
  * to stderr.
  *
- *	Anton Altaparmakov <aia21@cantab.net>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -39,6 +35,12 @@ const char *EXEC_VERSION = "1.0";
 #include "mst.h"
 #include "logfile.h"
 
+const char *EXEC_NAME = "dumplog";
+const char *EXEC_VERSION = "1.0";
+
+/**
+ * main
+ */
 int main(int argc, char **argv)
 {
 	s64 l, br;
diff --git a/ntfsprogs/ntfscluster.h b/ntfsprogs/ntfscluster.h
index fec1fb75..45ed324e 100644
--- a/ntfsprogs/ntfscluster.h
+++ b/ntfsprogs/ntfscluster.h
@@ -1,7 +1,7 @@
 /*
  * ntfscluster - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002 Richard Russon <ntfs@flatcap.org>
+ * Copyright (c) 2002 Richard Russon
  *
  * This utility will XXX
  *
diff --git a/ntfsprogs/ntfsdump_logfile.c b/ntfsprogs/ntfsdump_logfile.c
index 0a9c5f8f..796c5cdd 100644
--- a/ntfsprogs/ntfsdump_logfile.c
+++ b/ntfsprogs/ntfsdump_logfile.c
@@ -1,6 +1,4 @@
-const char *EXEC_NAME = "NtfsDump_LogFile";
-const char *EXEC_VERSION = "1.0";
-/*
+/**
  * NtfsDump_LogFile - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2002 Anton Altaparmakov
@@ -9,8 +7,6 @@ const char *EXEC_VERSION = "1.0";
  * NTFS partition and display the results on stdout. Errors will be output to
  * stderr.
  *
- *	Anton Altaparmakov <aia21@cantab.net>
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -56,6 +52,12 @@ const char *EXEC_VERSION = "1.0";
 #include "logfile.h"
 #include "mst.h"
 
+const char *EXEC_NAME = "NtfsDump_LogFile";
+const char *EXEC_VERSION = "1.0";
+
+/**
+ * main
+ */
 int main(int argc, char **argv)
 {
 	MFT_RECORD *m = NULL;
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index a5752450..0c114327 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -1,4 +1,4 @@
-/*
+/**
  * NtfsFix - Part of the Linux-NTFS project.
  *
  * Copyright (c) 2000-2003 Anton Altaparmakov.
@@ -58,6 +58,9 @@
 #include "disk_io.h"
 #include "logfile.h"
 
+/**
+ * main
+ */
 int main(int argc, char **argv)
 {
 	s64 l, br;
diff --git a/ntfsprogs/ntfsundelete.h b/ntfsprogs/ntfsundelete.h
index a7c76be3..400c33d2 100644
--- a/ntfsprogs/ntfsundelete.h
+++ b/ntfsprogs/ntfsundelete.h
@@ -1,7 +1,7 @@
 /*
  * ntfsundelete - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002 Richard Russon <ntfs@flatcap.org>
+ * Copyright (c) 2002 Richard Russon
  *
  * This utility will recover deleted files from an NTFS volume.
  *
diff --git a/ntfsprogs/ntfswipe.h b/ntfsprogs/ntfswipe.h
index 2546c7fb..cf1bb7cf 100644
--- a/ntfsprogs/ntfswipe.h
+++ b/ntfsprogs/ntfswipe.h
@@ -1,7 +1,7 @@
 /*
  * ntfswipe - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002 Richard Russon <ntfs@flatcap.org>
+ * Copyright (c) 2002 Richard Russon
  *
  * This utility will overwrite usused space on an NTFS volume.
  *
diff --git a/ntfsprogs/sd.c b/ntfsprogs/sd.c
index 0e0f0863..16115b4e 100644
--- a/ntfsprogs/sd.c
+++ b/ntfsprogs/sd.c
@@ -1,7 +1,9 @@
 #include "types.h"
 #include "layout.h"
 
-/*
+/**
+ * init_system_file_sd
+ *
  * NTFS 1.2 - System files security decriptors
  * ===========================================
  *
diff --git a/ntfsprogs/upcase.c b/ntfsprogs/upcase.c
index c18a2bd3..45ef8eea 100644
--- a/ntfsprogs/upcase.c
+++ b/ntfsprogs/upcase.c
@@ -1,8 +1,8 @@
 /**
  * upcase - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2001 Richard Russon <ntfs@flatcap.org>
- * Copyright (c) 2001-2002 Anton Altaparmakov <aia21@cantab.net>
+ * Copyright (c) 2001 Richard Russon
+ * Copyright (c) 2001-2002 Anton Altaparmakov
  *
  * Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov.
  *
@@ -26,6 +26,9 @@
 
 #include "types.h"
 
+/**
+ * init_upcase_table
+ */
 void init_upcase_table(uchar_t *uc, u32 uc_len)
 {
 	static int uc_run_table[][3] = { /* Start, End, Add */
diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c
index c19f3cfd..be9bbe2f 100644
--- a/ntfsprogs/utils.c
+++ b/ntfsprogs/utils.c
@@ -1,9 +1,9 @@
 /**
  * utils.c - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002 Richard Russon <ntfs@flatcap.org>
+ * Copyright (c) 2002 Richard Russon
  *
- * This utility will recover deleted files from an NTFS volume.
+ * A set of shared functions for ntfs utilities
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/ntfsprogs/utils.h b/ntfsprogs/utils.h
index 8469a044..206e7921 100644
--- a/ntfsprogs/utils.h
+++ b/ntfsprogs/utils.h
@@ -1,9 +1,9 @@
 /*
- * utils.c - Part of the Linux-NTFS project.
+ * utils.h - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002 Richard Russon <ntfs@flatcap.org>
+ * Copyright (c) 2002 Richard Russon
  *
- * This utility will recover deleted files from an NTFS volume.
+ * A set of shared functions for ntfs utilities
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by