diff --git a/client/Makefile.am b/client/Makefile.am
index 9f71abcb38..72cab37fab 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -28,7 +28,11 @@ boinccmd_SOURCES = boinc_cmd.cpp
 boinccmd_DEPENDENCIES = $(LIBBOINC)
 boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
 boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib
-boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+if OS_ANDROID
+   boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS)
+else    
+   boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+endif
 
 boinc_client_SOURCES = \
     acct_mgr.cpp \
@@ -80,7 +84,6 @@ boinc_client_SOURCES = \
     rr_sim.cpp \
     sandbox.cpp \
     scheduler_op.cpp \
-	thread.cpp \
     time_stats.cpp \
     whetstone.cpp \
     work_fetch.cpp
@@ -92,7 +95,11 @@ boinc_client_LDFLAGS = $(AM_LDFLAGS) $(SSL_LDFLAGS) -L../lib
 if OS_DARWIN
 boinc_client_LDFLAGS += -Wl,-flat_namespace,-undefined,dynamic_lookup
 endif
-boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+if OS_ANDROID
+   boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS)
+else    
+   boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
+endif
 
 boinc_clientdir = $(bindir)
 
diff --git a/configure.ac b/configure.ac
index 033541c24b..768e1e8973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -780,6 +780,8 @@ AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
 dnl or OS2
 AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null])
 AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null])
+dnl Android
+AM_CONDITIONAL(OS_ANDROID, [echo $host_alias | grep '^android' > /dev/null])
 
 dnl Whether to build fcgi components
 AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes])