diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 201f4dc3228..3c1b1966af3 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-03  Tobias Burnus  <burnus@net-b.de>
+
+	* class.c (gfc_find_derived_vtab): Disable ABI-breaking
+	generation of the "_final" subroutine for now.
+
 2012-09-03  Tobias Burnus  <burnus@net-b.de>
 
 	* class.c (finalize_component): Fixes to the comment.
diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c
index 71065d25841..5943ab835bb 100644
--- a/gcc/fortran/class.c
+++ b/gcc/fortran/class.c
@@ -1624,7 +1624,9 @@ gfc_find_derived_vtab (gfc_symbol *derived)
 		 components and the calls to finalization subroutines.
 		 Note: The actual wrapper function can only be generated
 		 at resolution time.  */
-
+	    /* FIXME: Enable ABI-breaking "_final" generation.  */
+	    if (0) 
+	    {
 	      if (gfc_add_component (vtype, "_final", &c) == FAILURE)
 		goto cleanup;
 	      c->attr.proc_pointer = 1;
@@ -1636,6 +1638,7 @@ gfc_find_derived_vtab (gfc_symbol *derived)
 	      /* Add procedure pointers for type-bound procedures.  */
 	      add_procs_to_declared_vtab (derived, vtype);
 	    }
+	  }
 
 have_vtype:
 	  vtab->ts.u.derived = vtype;