diff --git a/automake.in b/automake.in
index bab8c42..24fb15e 100755
--- a/automake.in
+++ b/automake.in
@@ -819,8 +819,8 @@ register_language ('name' => 'vala',
 		   'compile' => '$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)',
 		   'ccer' => 'VALAC',
 		   'compiler' => 'VALACOMPILE',
-		   'extensions' => ['.vala'],
-		   'output_extensions' => sub { (my $ext = $_[0]) =~ s/vala$/c/;
+		   'extensions' => ['.vala', '.gs'],
+		   'output_extensions' => sub { (my $ext = $_[0]) =~ s/(vala$|gs$)/c/;
 						return ($ext,) },
 		   'rule_file' => 'vala',
 		   '_finish' => \&lang_vala_finish,
@@ -5768,7 +5768,7 @@ sub lang_vala_rewrite
 {
     my ($directory, $base, $ext) = @_;
 
-    (my $newext = $ext) =~ s/vala$/c/;
+    (my $newext = $ext) =~ s/(vala$|gs$)/c/;
     return (LANG_SUBDIR, $newext);
 }
 
@@ -5947,7 +5947,7 @@ sub lang_vala_finish_target ($$)
             "\t  rm -f \$(srcdir)/${derived}_vala.stamp; \\\n".
             "\t  \$(am__cd) \$(srcdir) && \$(MAKE) \$(AM_MAKEFLAGS) ${derived}_vala.stamp; \\\n".
             "\tfi\n"
-            if $file =~ s/(.*)\.vala$/$1.c/;
+            if $file =~ s/(.*)\.(vala$|gs$)/$1.c/;
         }
     }