diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 212c67af2..fa3f88ba3 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-23  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* standalone/test-with-guile-module.c: Updated to GNU coding
+	standards; added standard license statement.
+
 2008-02-15  Ludovic Courtès  <ludo@gnu.org>
 
 	* tests/gc.test (gc): Add hack to clean up the stack so that the
diff --git a/test-suite/standalone/test-with-guile-module.c b/test-suite/standalone/test-with-guile-module.c
index e7abc81f8..14d3afdc7 100644
--- a/test-suite/standalone/test-with-guile-module.c
+++ b/test-suite/standalone/test-with-guile-module.c
@@ -1,50 +1,75 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
 #include <pthread.h>
 #include <libguile.h>
 
-void * thread_inner_main (void * unused);
-void * thread_main (void * unused);
-void * do_join (void * data);
-void * inner_main (void * unused);
+void *thread_inner_main (void *unused);
+void *thread_main (void *unused);
+void *do_join (void *data);
+void *inner_main (void *unused);
 
-void * thread_inner_main (void * unused)
+void *
+thread_inner_main (void *unused)
 {
   int argc = 3;
-  char* argv[] = { "guile",
-		   "-c",
-		   "(or (current-module) (exit -1))",
-		   0 };
+  char *argv[] = {
+    "guile",
+    "-c",
+    "(or (current-module) (exit -1))",
+    0
+  };
+
   scm_shell (argc, argv);
 
-  return NULL; /* dummy */
+  return NULL;			/* dummy */
 }
 
-void * thread_main (void * unused)
+void *
+thread_main (void *unused)
 {
   scm_with_guile (&thread_inner_main, NULL);
 
-  return NULL; /* dummy */
+  return NULL;			/* dummy */
 }
 
-void * do_join (void * data)
+void *
+do_join (void *data)
 {
-  pthread_t *thread = (pthread_t *)data;
+  pthread_t *thread = (pthread_t *) data;
 
   pthread_join (*thread, NULL);
 
-  return NULL; /* dummy */
+  return NULL;			/* dummy */
 }
 
-void * inner_main (void * unused)
+void *
+inner_main (void *unused)
 {
   pthread_t thread;
 
   pthread_create (&thread, NULL, &thread_main, NULL);
   scm_without_guile (do_join, &thread);
 
-  return NULL; /* dummy */
+  return NULL;			/* dummy */
 }
 
-int main (int argc, char **argv)
+int
+main (int argc, char **argv)
 {
   scm_with_guile (&inner_main, NULL);