diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8c26b46471d..58f421f6398c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-04  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+	* gcc/config/s390/s390.c (s390_expand_builtin): Exlude non-htm
+	builtins from checking for -mhtm option.
+
 2015-03-03  Jan Hubicka  <hubicka@ucw.cz>
 
 	* tree-sra.c (convert_callers): Use call_for_symbol_and_aliases.
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 1924f2acb68f..593c0cc8ee2d 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -10122,7 +10122,7 @@ s390_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED,
   if (icode == 0)
     internal_error ("bad builtin fcode");
 
-  if (!TARGET_HTM)
+  if (!TARGET_HTM && fcode <= S390_BUILTIN_TX_ASSIST)
     error ("Transactional execution builtins not enabled (-mhtm)\n");
 
   /* Set a flag in the machine specific cfun part in order to support