diff --git a/tools/process-metadata b/tools/process-metadata
index 9c94dedfe4..3c90a40999 100755
--- a/tools/process-metadata
+++ b/tools/process-metadata
@@ -6,16 +6,23 @@ $section = "";
 $heading = "";
 $accumulated = "";
 
+print "
+void
+UIConfiguration::build_metadata ()
+{
+
+#define VAR_META(name,...)  { char const * _x[] { __VA_ARGS__ }; all_metadata.insert (std::make_pair<std::string,Metadata> ((name), PBD::upcase (_x))); }\n\n";
+
 while (<>) {
       if (/\[SECTION:/) {
 	  chop;
 	  s/\[SECTION://;
 	  s/\]//;
 	  $section = $_;
-	  print $section, "\n";
 	  $in_section = 1;
 	  $in_heading = 0;
 	  $heading = "";
+	  $accumulated = "";
 	  next;
       }
 
@@ -29,7 +36,7 @@ while (<>) {
 	  if ($accumulated ne "") {
 	      @arr = split (/\s+/, $accumulated);
 	      
-	      print "VAR_META (X_(\"$heading\"), ";
+	      print "\tVAR_META (X_(\"$heading\"), ";
 	      for my $word (@arr) {
 		  if ($word ne "") {
 		      print "_(\"$word\"), ";
@@ -52,3 +59,5 @@ while (<>) {
 
       $accumulated .= $_;
 }
+
+print "\n}\n";