diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0a8ba69b69be..7f7414ebb650 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,9 @@
 2003-11-14  Andreas Jaeger  <aj@suse.de>
 
+	* lang.opt: Change -Wno-long-long to -Wlong-long since the latter
+	is the canonical version. 
+	* misc.c (gnat_handle_option): Likewise.
+
 	* Makefile.in (LIBGNAT_TARGET_PAIRS): Add rules for x86_64-linux.
 
 	* 5nsystem.ads: New file for x86_64-linux-gnu.
diff --git a/gcc/ada/lang.opt b/gcc/ada/lang.opt
index ec3e924ad7bf..7ac89f964260 100644
--- a/gcc/ada/lang.opt
+++ b/gcc/ada/lang.opt
@@ -45,7 +45,7 @@ Wwrite-strings
 Ada
 ; Documented for C
 
-Wno-long-long
+Wlong-long
 Ada
 ; Documented for C
 
diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index c7510fcc5c27..cd9663c73e47 100644
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -259,7 +259,7 @@ gnat_handle_option (size_t scode, const char *arg, int value ATTRIBUTE_UNUSED)
     case OPT_Wmissing_prototypes:
     case OPT_Wstrict_prototypes:
     case OPT_Wwrite_strings:
-    case OPT_Wno_long_long:
+    case OPT_Wlong_long:
       break;
 
       /* This is handled by the front-end.  */