diff --git a/src/documentation/haiku_book/midi/midi2endpoint.xml b/src/documentation/haiku_book/midi/midi2endpoint.xml
index 2274ae2ef8..2c2da1bc06 100644
--- a/src/documentation/haiku_book/midi/midi2endpoint.xml
+++ b/src/documentation/haiku_book/midi/midi2endpoint.xml
@@ -31,8 +31,8 @@
 		<title>Name()</title>
 		
 		<methodsynopsis>
-			<type>const char *</type>
-			<methodname>Name</methodname>
+			<type><modifier>const</modifier> char *</type>
+			<methodname>Name</methodname><void/>
 			<modifier>const</modifier>
 		</methodsynopsis>
 		
@@ -56,7 +56,7 @@
 		
 		<methodsynopsis>
 			<void/> <methodname>SetName</methodname>
-			<methodparam><modifier>const</modifier><type>char *</type><parameter>name</parameter></methodparam>
+			<methodparam><type><modifier>const</modifier>char *</type><parameter>name</parameter></methodparam>
 		</methodsynopsis>
 		
 		<para>
@@ -89,7 +89,7 @@
 		<title>ID()</title>
 		
 		<methodsynopsis>
-			<type>int32</type> <methodname>Name</methodname> <void/> <modifier>const</modifier>
+			<type>int32</type> <methodname>ID</methodname> <void/> <modifier>const</modifier>
 		</methodsynopsis>
 		
 		<para>
@@ -390,7 +390,7 @@ if (endp->IsConsumer())
 		
 		<methodsynopsis>
 			<type>status_t</type> <methodname>SetProperties</methodname>
-			<methodparam><modifier>const</modifier><type>BMessage *</type><parameter>properties</parameter></methodparam>
+			<methodparam><type><modifier>const</modifier>BMessage *</type><parameter>properties</parameter></methodparam>
 		</methodsynopsis>
 		
 		<para>
diff --git a/src/documentation/haiku_book/midi/midi2producer.xml b/src/documentation/haiku_book/midi/midi2producer.xml
index d66123449a..ab2b98cf70 100644
--- a/src/documentation/haiku_book/midi/midi2producer.xml
+++ b/src/documentation/haiku_book/midi/midi2producer.xml
@@ -25,7 +25,7 @@
 		<methodsynopsis>
 			<type>status_t</type>
 			<methodname>Connect</methodname>
-			<methodparam><type>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
+			<methodparam><type><modifier>const</modifier>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
 		</methodsynopsis>
 		
 		<para>
@@ -56,7 +56,7 @@
 		<methodsynopsis>
 			<type>status_t</type>
 			<methodname>Disconnect</methodname>
-			<methodparam><type>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
+			<methodparam><type><modifier>const</modifier>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
 		</methodsynopsis>
 		
 		<para>
@@ -84,7 +84,8 @@
 		<methodsynopsis>
 			<type>bool</type>
 			<methodname>IsConnected</methodname>
-			<methodparam><type>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
+			<methodparam><type><modifier>const</modifier>BMidiConsumer *</type> <parameter>cons</parameter></methodparam>
+			<modifier>const</modifier>
 		</methodsynopsis>
 		
 		<para>
diff --git a/src/tools/docbook/headersampler/HeaderSampler.pl b/src/tools/docbook/headersampler/HeaderSampler.pl
index c0c530bc67..8b41d23a27 100644
--- a/src/tools/docbook/headersampler/HeaderSampler.pl
+++ b/src/tools/docbook/headersampler/HeaderSampler.pl
@@ -80,6 +80,7 @@ sub HandleTextline {
 		# skip 'typedef' or 'struct' region.
 		(/^typedef/ || /^struct/ || /^namespace/) && do {
 			$gIsIgnoring = 1;
+			if ( /^namespace.*}$/ ) { $gIsIgnoring = 0; }
 			last SWITCH;
 			};
 
@@ -193,24 +194,58 @@ sub PrintFunction {
 	$funcname = pop();
 	$functype = join(' ', @_);
 
+	if ( $funcname =~ /^\*/ ) {
+		$funcname = $';
+		$functype = $functype . " *";
+	}
+
 # handle func arg list.
-#	split(/[ ]*,[ ]*/, $funcargs);
-#	my @args = @_;
-#		for (@args) {
-#			if ( /[ ]*=[ ]*/ ) { $_ = $`; }		# for default value; ex. (short X = 100)
-#			split(/[ ]+/);
-#			pop();
-#			$_ = join(' ',@_);
-#		}
-#	$funcargs = join(', ', @args);
+	split(/[ ]*,[ ]*/, $funcargs);
+	my @args = @_;
+		for (@args) {
+			$paramconst = "";
+			if ( /const*/ ) { $paramconst = "<modifier>const</modifier>"; }
+			if ( /[ ]*=[ ]*/ ) { $_ = $`; }		# for default value; ex. (short X = 100)
+			split(/[ ]+/);
+			$paramname = pop();
+			$paramtype = pop();
+			if ( $paramname =~ /^\*/ ) {
+				$paramname = $';
+				$paramtype = $paramtype . " *";
+			}
+			$_ = "<type>" . $paramconst . $paramtype . "</type> <parameter>" . $paramname . "</parameter>"
+		}
+	$funcargs = join('</methodparam><methodparam>', @args);
 
 	if ($functype) {
-		$functype = $functype . " "
+		$_ = $functype;
+		$funcmod = "";
+		if ( s/^virtual[ ]*// ) { 
+			$funcmod .= "virtual" 
+		}
+		if ( s/^static[ ]*// ) { 
+			if ( $funcmod =~ /^$/ ) { 
+				$funcmode .= " "; 
+			}
+			$funcmode .= "static" 
+		}
+		if ( /^void/ ) {
+			$functype = $funcmode . "<void/>"
+		} else {
+			$typeconst = "";
+			if ( /^const / ) { $typeconst = "<modifier>const</modifier>"; $_ = $'; }
+			$functype = $funcmode . "<type>" . $typeconst . $_ . "</type>"
+		}
 	}
 	if ($funcconst) {
-		$funcconst = " " . $funcconst
+		$funcconst = " " . "<modifier>" . $funcconst . "</modifier>"
 	}
-	$_ = $functype . $funcname . "(" . $funcargs . ")" . $funcconst;
+	if ($funcargs) {
+		$funcargs = "<methodparam>" . $funcargs . "</methodparam>"
+	} else {
+		$funcargs = "<void/>"
+	}
+	$_ = $functype . " <methodname>" . $funcname . "</methodname> " . $funcargs . $funcconst;
 	ValidateDocbook();
 #	print "FUNC = TYPE($funcname)+NAME($funcname)+ARGS($funcargs)\n";
 #		print $funcname . "\t" x CalcTabs($funcname,5) . $functype . "(" . $funcargs . ")";
@@ -224,26 +259,39 @@ sub PrintFunction {
 sub ValidateDocbook {
 
 	open(IN2, $gDocbookpath) || die "Can't open '$gDocbookpath'";
+
+	# we drop every space for the moment
+	s/[\t ]//g;
+
 	my $line = "";
-	my $last1 = "";
-	my $last2 = "";
-	my $input = $_ ;
-	my $pattern = "<title>" . $_ . "</title>" ;
+	my $pattern = $_;
 	my $found = 0;
+	my $ignoring = 1;
+
 	while (<IN2>) {
 		chomp;
 		s/^[\t ]+//;
 		s/[\t ]+$//;
-		$line = $last1 . $last2 . " " . $_ ;
-		if ( index($line, $pattern) >= 0 ) {
-			$found = 1;
-			break;
+		s/[\t ]//g;
+		if ($ignoring) {
+			if ( m/<methodsynopsis>/ ) {
+				$line = $';
+				$ignoring = 0;
+			}
+		} else {
+			$line .= $_;
+			if ( index($line, $pattern) >= 0 ) {
+				$found = 1;
+				break;
+			}
+			if ( $line =~ /<\/methodsynopsis>/ ) {
+				$line = "";
+				$ignoring = 1;
+			}
 		}
-		$last1 = $last2;
-		$last2 = $_;
 	}
 	if ( $found == 0 ) {
-		print $input . "\n" ;
+		print $pattern . "\n" ;
 	}
 	close IN2;
 }