diff --git a/checkin_notes b/checkin_notes
index a0f5b8178c..04bb75ebf6 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5425,3 +5425,12 @@ David  10 Aug 2012
 
     sched/
         sched_util.cpp
+
+David  10 Aug 2012
+    - client: Android-related tweaks, from Joachim
+
+    client/
+        main.cpp
+    lib/
+        synch.cpp
+        android_log.h
diff --git a/client/main.cpp b/client/main.cpp
index 8bb9464a62..eb9cf28102 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -380,7 +380,6 @@ int main(int argc, char** argv) {
     int retval = 0;
 
 #ifdef ANDROID
-    chdir(CWD); //CWD defined at lib/android_log.h
     char ccwd[1024];
     getcwd(ccwd, sizeof(ccwd));
     char msg[1024];
diff --git a/lib/android_log.h b/lib/android_log.h
index d2dc8ddc47..db704ca164 100644
--- a/lib/android_log.h
+++ b/lib/android_log.h
@@ -20,5 +20,3 @@
 #define LOG_TAG "BOINC"
 #define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG, __VA_ARGS__)
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
-//setup cwd
-#define CWD "/data/data/edu.berkeley.boinc/client"
diff --git a/lib/synch.cpp b/lib/synch.cpp
index d1c687a6e7..13125b1ef2 100644
--- a/lib/synch.cpp
+++ b/lib/synch.cpp
@@ -18,9 +18,9 @@
 
 // interfaces for accessing sempahores
 
-#include "synch.h"
+#ifdef HAVE_SYS_SEM_H
 
-#ifndef ANDROID //disabled on Android
+#include "synch.h"
 
 #include "config.h"
 #include <cstdio>
@@ -114,4 +114,4 @@ int get_key(char* path, int id, key_t& key) {
     return 0;
 }
 
-#endif //ANDROID
+#endif //HAVE_SYS_SEM_H