diff --git a/gas/ChangeLog b/gas/ChangeLog
index 42198b9f04c..7b574723cb9 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-22  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* as.c: Add missing function prototype.
+	* config/obj-aout.c: Fix compile time warning.
+
 2001-09-21  Bruno Haible  <haible@clisp.cons.org>
 
 	* config/tc-openrisc.c: Don't include <ctype.h>.
diff --git a/gas/as.c b/gas/as.c
index 2ce2fb98bf3..6eaea89273e 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -766,6 +766,8 @@ the GNU General Public License.  This program has absolutely no warranty.\n"));
 
 static long start_time;
 
+int main PARAMS ((int, char **));
+
 int
 main (argc, argv)
      int argc;
diff --git a/gas/config/obj-aout.c b/gas/config/obj-aout.c
index e5ffdf15065..a3943068312 100644
--- a/gas/config/obj-aout.c
+++ b/gas/config/obj-aout.c
@@ -755,4 +755,4 @@ const struct format_ops aout_format_ops =
   0,	/* read_begin_hook */
   0 	/* symbol_new_hook */
 };
-#endif BFD_ASSEMBLER
+#endif /* BFD_ASSEMBLER */