diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0b3eeb3616..1cf5dbda15 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,19 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+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
+
+  * include/hbsetup.h
+  * src/common/hbver.c
+    * detect 64bit ARM CPUs
+
+  * contrib/hbct/envparam.c
+  * contrib/hbnf/getenvrn.c
+    ! disabled ENVPARAM() and FT_GETE() in iOS builds
+    + added support for FT_GETE() in OS2 builds
+
 2015-05-13 16:59 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbct/ctwin.c
     ! added protection against GPF in hb_ctwGetPosWindow() called before
diff --git a/contrib/hbct/envparam.c b/contrib/hbct/envparam.c
index 99857539bf..7f6176c9fa 100644
--- a/contrib/hbct/envparam.c
+++ b/contrib/hbct/envparam.c
@@ -49,7 +49,7 @@
 
 #include "hbapi.h"
 
-#if defined( HB_OS_UNIX )
+#if defined( HB_OS_UNIX ) && ! defined( HB_OS_IOS )
 #  include <unistd.h>
 #  if defined( HB_OS_DARWIN )
 #     include <crt_externs.h>
@@ -75,7 +75,8 @@
 
 HB_FUNC( ENVPARAM )
 {
-#if defined( HB_OS_UNIX ) || defined( HB_OS_DOS ) || defined( HB_OS_OS2 )
+#if ( defined( HB_OS_UNIX ) && ! defined( HB_OS_IOS ) ) || \
+    defined( HB_OS_DOS ) || defined( HB_OS_OS2 )
    char * const * pEnviron = environ, * const * pEnv;
    char * pResult = NULL, * pDst;
    HB_SIZE nSize = 0;
diff --git a/contrib/hbnf/getenvrn.c b/contrib/hbnf/getenvrn.c
index d7411f6202..3937a62e8e 100644
--- a/contrib/hbnf/getenvrn.c
+++ b/contrib/hbnf/getenvrn.c
@@ -25,17 +25,25 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-#if defined( HB_OS_UNIX )
+#if defined( HB_OS_UNIX ) && ! defined( HB_OS_IOS )
 #  include <unistd.h>
 #  if defined( HB_OS_DARWIN )
 #     include <crt_externs.h>
 #     define environ  ( *_NSGetEnviron() )
 #  elif ! defined( __WATCOMC__ )
-extern char ** environ;
+      extern char ** environ;
 #  endif
 #elif defined( HB_OS_DOS )
-#  define environ     _environ
-extern char ** _environ;
+#  if defined( __DJGPP__ )
+      extern char ** environ;
+#  elif ! defined( __WATCOMC__ )
+#     define environ _environ
+      extern char ** _environ;
+#  endif
+#elif defined( HB_OS_OS2 )
+#  if ! defined( __WATCOMC__ )
+      extern char ** environ;
+#  endif
 #elif defined( HB_OS_WIN ) && ! defined( HB_OS_WIN_CE )
 #  include "hbwinuni.h"
 #  include <windows.h>
@@ -48,7 +56,8 @@ extern char ** _environ;
 
 HB_FUNC( FT_GETE )
 {
-#if defined( HB_OS_DOS ) || defined( HB_OS_UNIX )
+#if ( defined( HB_OS_UNIX ) && ! defined( HB_OS_IOS ) ) || \
+    defined( HB_OS_DOS ) || defined( HB_OS_OS2 )
    {
       char * buffer = NULL;
       int    x;
diff --git a/include/hbsetup.h b/include/hbsetup.h
index 28bce64cca..bbcab1688a 100644
--- a/include/hbsetup.h
+++ b/include/hbsetup.h
@@ -153,6 +153,9 @@
       defined( __MINGW64__ )
    #define HB_CPU_X86_64
 
+#elif defined( __arm64__ )
+   #define HB_CPU_ARM_64
+
 #elif defined( __arm__ ) || \
       defined( __arm ) || \
       defined( ARM ) || \
@@ -370,7 +373,8 @@
 
 /* Sub-option inside HB_OS_DARWIN */
 #ifndef HB_OS_IOS /* Experimental */
-   #if defined( HB_OS_DARWIN ) && defined( HB_CPU_ARM )
+   #if defined( HB_OS_DARWIN ) && \
+       ( defined( HB_CPU_ARM ) || defined( __IPHONE_OS_VERSION_MIN_REQUIRED ) )
       #define HB_OS_IOS
    #endif
 #endif
diff --git a/src/common/hbver.c b/src/common/hbver.c
index db93194f7e..fd51e10211 100644
--- a/src/common/hbver.c
+++ b/src/common/hbver.c
@@ -119,6 +119,8 @@ const char * hb_verCPU( void )
    return "SPARC64";
 #elif defined( HB_CPU_ARM )
    return "ARM";
+#elif defined( HB_CPU_ARM_64 )
+   return "ARM64";
 #elif defined( HB_CPU_MIPS )
    return "MIPS";
 #elif defined( HB_CPU_SH )