diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3c1b1966af3..c1de9833629 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-03  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/54467
+	* class.c (gfc_find_derived_vtab): Fix disabling of _final
+	by continuing to generate normal type-bound procedures.
+
 2012-09-03  Tobias Burnus  <burnus@net-b.de>
 
 	* class.c (gfc_find_derived_vtab): Disable ABI-breaking
diff --git a/gcc/fortran/class.c b/gcc/fortran/class.c
index 5943ab835bb..dca2cfc1cda 100644
--- a/gcc/fortran/class.c
+++ b/gcc/fortran/class.c
@@ -1634,10 +1634,10 @@ gfc_find_derived_vtab (gfc_symbol *derived)
 	      c->tb = XCNEW (gfc_typebound_proc);
 	      c->tb->ppc = 1;
 	      generate_finalization_wrapper (derived, ns, tname, c);
+	    }
 
 	      /* Add procedure pointers for type-bound procedures.  */
 	      add_procs_to_declared_vtab (derived, vtype);
-	    }
 	  }
 
 have_vtype: