diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c67cbdc8f1..33f822bdb5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-05  Tristan Gingold  <gingold@adacore.com>
+
+        * osabi.c (gdb_osabi_names): Add OpenVMS.
+        (generic_elf_osabi_sniffer): Likewise.
+        * defs.h (gdb_osabi): Add GDB_OSABI_OPENVMS.
+
 2012-03-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Removed unused code.
diff --git a/gdb/defs.h b/gdb/defs.h
index a97487a480..1075111242 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -948,6 +948,7 @@ enum gdb_osabi
   GDB_OSABI_DICOS,
   GDB_OSABI_DARWIN,
   GDB_OSABI_SYMBIAN,
+  GDB_OSABI_OPENVMS,
 
   GDB_OSABI_INVALID		/* keep this last */
 };
diff --git a/gdb/osabi.c b/gdb/osabi.c
index aba9842734..faffe30b44 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -72,6 +72,7 @@ static const char * const gdb_osabi_names[] =
   "DICOS",
   "Darwin",
   "Symbian",
+  "OpenVMS",
 
   "<invalid>"
 };
@@ -549,6 +550,10 @@ generic_elf_osabi_sniffer (bfd *abfd)
 			     generic_elf_osabi_sniff_abi_tag_sections,
 			     &osabi);
       break;
+
+    case ELFOSABI_OPENVMS:
+      osabi = GDB_OSABI_OPENVMS;
+      break;
     }
 
   if (osabi == GDB_OSABI_UNKNOWN)