diff --git a/src/android/Makefile b/src/android/Makefile
index 88cce9d..e82fbd3 100644
--- a/src/android/Makefile
+++ b/src/android/Makefile
@@ -30,6 +30,10 @@ CLASSPATH=br/com/bb/pw3270
 Debug: jni/lib3270jni.h
 	@$(NDKBUILD)
 
+clean:
+	@rm -fr obj
+	@rm -f jni/lib3270jni.h
+
 jni/lib3270jni.h: bin/classes/$(CLASSPATH)/lib3270.class
 	@$(JAVAH) -o $@ -classpath bin/classes $(subst /,.,$(CLASSPATH)).lib3270
 
diff --git a/src/android/jni/Android.mk b/src/android/jni/Android.mk
index 567f73d..b188609 100644
--- a/src/android/jni/Android.mk
+++ b/src/android/jni/Android.mk
@@ -27,9 +27,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-# include ../lib3270/sources.mak
-TERMINAL_SOURCES=	bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
-					host.c sf.c ansi.c log.c resolver.c xio.c tables.c proxy.c utf8.c charset.c
+include ../lib3270/sources.mak
 
 LOCAL_CFLAGS=-I../include
 LOCAL_MODULE    := lib3270
diff --git a/src/lib3270/proxy.c b/src/lib3270/proxy.c
index 958436d..21c7b0e 100644
--- a/src/lib3270/proxy.c
+++ b/src/lib3270/proxy.c
@@ -548,9 +548,13 @@ proxy_socks4(int fd, char *host, unsigned short port, int force_a)
 	}
 
 	/* Resolve the username. */
+#ifdef ANDROID
+	user = "android";
+#else
 	user = getenv("USER");
 	if (user == CN)
 	    	user = "nobody";
+#endif
 
 	/* Send the request to the server. */
 	if (use_4a) {
diff --git a/src/lib3270/sources.mak b/src/lib3270/sources.mak
index 31fa7ef..91bb58d 100644
--- a/src/lib3270/sources.mak
+++ b/src/lib3270/sources.mak
@@ -22,14 +22,13 @@
 #
 # perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
 # erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
-# licinio@bb.com.br			(Licínio Luis Branco)
-# kraucer@bb.com.br			(Kraucer Fernandes Mazuco)
 #
 
-SOURCES = XtGlue.c init.c actions.c ansi.c charset.c ctlr.c \
-		ft.c ft_cut.c ft_dft.c glue.c host.c kybd.c \
-		proxy.c resources.c rpq.c screen.c see.c \
-		sf.c tables.c telnet.c toggles.c trace_ds.c utf8.c util.c \
-		xio.c resolver.c log.c paste.c macros.c fallbacks.c version.c \
-		selection.c bounds.c
+# Terminal only sources
+TERMINAL_SOURCES =	bounds.c XtGlue.c ctlr.c util.c toggles.c screen.c selection.c kybd.c telnet.c \
+					host.c sf.c ansi.c log.c resolver.c xio.c tables.c proxy.c utf8.c charset.c
+
+# Full library sources
+SOURCES =			$(TERMINAL_SOURCES) init.c actions.c ft.c ft_cut.c ft_dft.c glue.c resources.c \
+					rpq.c see.c trace_ds.c paste.c macros.c fallbacks.c version.c
 
--
libgit2 0.21.2