Index: gtkdoc-scangobj.in
===================================================================
--- gtkdoc-scangobj.in	(revision 495)
+++ gtkdoc-scangobj.in	(working copy)
@@ -1403,6 +1413,8 @@
   guint n_properties;
   gboolean child_prop;
   gboolean style_prop;
+  gboolean is_pointer;
+  const gchar *type_name;
   gchar *type_desc;
   gchar *default_value;
 
@@ -1471,8 +1483,9 @@
 
 	type_desc = describe_type (spec);
 	default_value = describe_default (spec);
-        fprintf (fp, "<ARG>\\n<NAME>%s::%s</NAME>\\n<TYPE>%s</TYPE>\\n<RANGE>%s</RANGE>\\n<FLAGS>%s</FLAGS>\\n<NICK>%s</NICK>\\n<BLURB>%s%s</BLURB>\\n<DEFAULT>%s</DEFAULT>\\n</ARG>\\n\\n",
-	         object_class_name, g_param_spec_get_name (spec), g_type_name (spec->value_type), type_desc, flags, nick ? nick : "(null)", blurb ? blurb : "(null)", dot, default_value);
+	type_name = get_type_name (spec->value_type, &is_pointer);
+        fprintf (fp, "<ARG>\\n<NAME>%s::%s</NAME>\\n<TYPE>%s%s</TYPE>\\n<RANGE>%s</RANGE>\\n<FLAGS>%s</FLAGS>\\n<NICK>%s</NICK>\\n<BLURB>%s%s</BLURB>\\n<DEFAULT>%s</DEFAULT>\\n</ARG>\\n\\n",
+	         object_class_name, g_param_spec_get_name (spec), type_name, is_pointer ? "*" : "", type_desc, flags, nick ? nick : "(null)", blurb ? blurb : "(null)", dot, default_value);
 	g_free (type_desc);
 	g_free (default_value);
       }
Index: gtkdoc-mkdb.in
===================================================================
--- gtkdoc-mkdb.in	(revision 495)
+++ gtkdoc-mkdb.in	(working copy)
@@ -2664,13 +2703,15 @@
 	    my $default = $ArgDefaults[$i];
 	    my $default_output = CreateValidSGML($default);
 
+	    if ($type eq "GtkString") {
+		$type = "char*";
+	    }
 	    if ($type eq "GtkSignal") {
 		$type = "GtkSignalFunc, gpointer";
 		$type_output = &MakeXRef ("GtkSignalFunc") . ", "
 		    . &MakeXRef ("gpointer");
-	    } elsif ($type eq "GtkString") {
-		$type = "gchar*";
-		$type_output = &MakeXRef ("gchar") . "*";
+	    } elsif ($type =~ m/^(\w+)\*$/) {
+		$type_output = &MakeXRef ($1) . "*";
 	    } else {
 		$type_output = &MakeXRef ($type);
 	    }
