diff --git a/ChangeLog.txt b/ChangeLog.txt
index 1cf5dbda15..7a85836ba4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,19 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-05-19 15:17 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/common/hbprintf.c
+    * removed modfl() protection with old HB_OS_IPHONE macro.
+      If someone will need it for some old iOS versions then please read
+      it protected by HB_OS_IOS and __IPHONE_OS_VERSION_MIN_REQUIRED
+      macros or inform me about the exact iOS version which do not support
+      modfl() and I'll add it.
+
+  * include/hbatomic.h
+    * disable GCC atomic macros for GCC <= 4.5 in OS2 builds.
+      They can be manually enabled by users using:
+         set HB_USER_CFLAGS=-DHB_USE_GCCATOMIC
+
 2015-05-18 23:01 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbsetup.h
     * set HB_OS_IOS when __IPHONE_OS_VERSION_MIN_REQUIRED is defined
diff --git a/include/hbatomic.h b/include/hbatomic.h
index 48d27c96e3..ca56414920 100644
--- a/include/hbatomic.h
+++ b/include/hbatomic.h
@@ -89,7 +89,11 @@ HB_EXTERN_BEGIN
 
 #  if defined( HB_USE_GCCATOMIC_OFF )
 #     undef HB_USE_GCCATOMIC
-#  elif ( ( __GNUC__ > 4 ) || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 1) ) && \
+#  elif defined( HB_OS_OS2 ) && \
+        ( __GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ <= 5 ) )
+      /* allow users to enable it manually by HB_USE_GCCATOMIC macro */
+      /* #undef HB_USE_GCCATOMIC */
+#  elif ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 1 ) ) && \
         ! defined( __MINGW32CE__ ) && ! defined( HB_USE_GCCATOMIC )
 #     define HB_USE_GCCATOMIC
 #  elif defined( HB_OS_WIN ) && defined( __clang__ )
diff --git a/src/common/hbprintf.c b/src/common/hbprintf.c
index 7a0aca72f2..7cc22b8d2d 100644
--- a/src/common/hbprintf.c
+++ b/src/common/hbprintf.c
@@ -166,7 +166,7 @@
 #     define _x_long_dbl      long double
 #     if defined( HB_NO_MODFL ) || \
          defined( __WATCOMC__ ) || defined( __MINGW32CE__ ) || defined( HB_OS_CYGWIN ) || \
-         defined( HB_OS_BEOS ) || defined( HB_OS_IPHONE ) || defined( HB_OS_SYMBIAN ) || \
+         defined( HB_OS_BEOS ) || defined( HB_OS_SYMBIAN ) || \
          defined( __OpenBSD__ ) || defined( __NetBSD__ ) || defined( __DragonFly__ ) || \
          defined( __TINYC__ ) || \
          ( defined( __FreeBSD_version ) && __FreeBSD_version < 603000 ) || \