diff --git a/src/common/classes/TempFile.cpp b/src/common/classes/TempFile.cpp
index 3f7173c6e5..9fbafc925d 100644
--- a/src/common/classes/TempFile.cpp
+++ b/src/common/classes/TempFile.cpp
@@ -58,6 +58,8 @@ static const char* ENV_VAR = "FIREBIRD_TMP";
 static const char* DEFAULT_PATH =
 #if defined(UNIX)
 	"/tmp/";
+#elif defined(ANDROID)
+	"/data/local/tmp/";
 #elif defined(WIN_NT)
 	"c:\\temp\\";
 #else
diff --git a/src/common/file_params.h b/src/common/file_params.h
index 6ca17ad90e..c422f43edb 100644
--- a/src/common/file_params.h
+++ b/src/common/file_params.h
@@ -59,9 +59,12 @@ static const char* const PORT_FILE		= "fb_port_%d";
 #endif
 
 // keep MSG_FILE_LANG in sync with build_file.epp
-#ifdef WIN_NT
+#if defined(WIN_NT)
 static const char* const WORKFILE	= "c:\\temp\\";
 static const char MSG_FILE_LANG[]	= "intl\\%.10s.msg";
+#elif defined(ANDROID)
+static const char* const WORKFILE	= "/data/local/tmp/";
+static const char MSG_FILE_LANG[]	= "intl/%.10s.msg";
 #else
 static const char* const WORKFILE	= "/tmp/";
 static const char MSG_FILE_LANG[]	= "intl/%.10s.msg";
diff --git a/src/common/isc.cpp b/src/common/isc.cpp
index 6a85af1f43..e90e47d77c 100644
--- a/src/common/isc.cpp
+++ b/src/common/isc.cpp
@@ -355,7 +355,9 @@ bool ISC_get_user(Firebird::string* name, int* id, int* group)
 		p = password->pw_name;
 	else
 		p = "";
+#ifndef ANDROID		// Why do they print silly unimplemted message for this function?
 	endpwent();
+#endif
 
 	if (name)
 		*name = p;
diff --git a/src/include/cross/android.arme b/src/include/cross/android.arme
index 9908a77f4f..53daac8200 100644
--- a/src/include/cross/android.arme
+++ b/src/include/cross/android.arme
@@ -26,7 +26,7 @@
 /* #undef DARWIN */
 
 /* Use binary relocation? */
-/* #undef ENABLE_BINRELOC */
+#define ENABLE_BINRELOC
 
 /* Alignment of long */
 #define FB_ALIGNMENT 8