diff --git a/Android.mk b/Android.mk
index aa63f3b0c..438ffe761 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,5 @@
 TOP_PATH := $(call my-dir)
+
 include $(TOP_PATH)/src/Android.mk
 
 include $(TOP_PATH)/adat/Android.mk
@@ -10,6 +11,7 @@ include $(TOP_PATH)/celestron/Android.mk
 include $(TOP_PATH)/drake/Android.mk
 include $(TOP_PATH)/dummy/Android.mk
 include $(TOP_PATH)/easycomm/Android.mk
+include $(TOP_PATH)/ether6/Android.mk
 include $(TOP_PATH)/flexradio/Android.mk
 include $(TOP_PATH)/fodtrack/Android.mk
 include $(TOP_PATH)/gs232a/Android.mk
diff --git a/adat/Android.mk b/adat/Android.mk
index adf4807f5..b5c0dd531 100644
--- a/adat/Android.mk
+++ b/adat/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := adat.c adt_200a.c
 LOCAL_MODULE := adat
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/alinco/Android.mk b/alinco/Android.mk
index 92573b9d2..e23b2902c 100644
--- a/alinco/Android.mk
+++ b/alinco/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := dx77.c alinco.c
 LOCAL_MODULE := alinco
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/amsat/Android.mk b/amsat/Android.mk
index 16949f874..12aaf34a3 100644
--- a/amsat/Android.mk
+++ b/amsat/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := if100.c
 LOCAL_MODULE := amsat
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/android/hamlib-compile b/android/hamlib-compile
old mode 100644
new mode 100755
index c664114fe..68c64efe2
--- a/android/hamlib-compile
+++ b/android/hamlib-compile
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -e
+set -x
 
 tmp=`dirname $0`
 HAMLIB=`readlink -f $tmp/..`
@@ -8,11 +9,16 @@ cd $HAMLIB
 
 rm -f $HAMLIB/include/config.h
 
+if [ "$1" = "clean"]; then
+    ndk-build NDK_PROJECT_PATH=$HAMLIB APP_BUILD_SCRIPT=$HAMLIB/Android.mk clean
+    exit
+fi
+
 if [ -n "$1" ]; then
     ndk-build NDK_PROJECT_PATH=$HAMLIB APP_BUILD_SCRIPT=$HAMLIB/Android.mk $1
     exit
 fi
 
 
-ndk-build NDK_PROJECT_PATH=$HAMLIB APP_BUILD_SCRIPT=$HAMLIB/Android.mk hamlib
+#ndk-build NDK_PROJECT_PATH=$HAMLIB APP_BUILD_SCRIPT=$HAMLIB/Android.mk hamlib
 ndk-build NDK_PROJECT_PATH=$HAMLIB APP_BUILD_SCRIPT=$HAMLIB/Android.mk
diff --git a/aor/Android.mk b/aor/Android.mk
index 20abdf52d..2d595d87e 100644
--- a/aor/Android.mk
+++ b/aor/Android.mk
@@ -6,9 +6,8 @@ LOCAL_SRC_FILES := ar8200.c ar8000.c ar5000.c ar3000.c ar7030.c ar3030.c \
 	     ar2700.c ar8600.c ar7030p.c ar7030p_utils.c sr2200.c aor.c
 LOCAL_MODULE := aor
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ars/Android.mk b/ars/Android.mk
index 41aa1f176..785d38eac 100644
--- a/ars/Android.mk
+++ b/ars/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ars.c
 LOCAL_MODULE := ars
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/celestron/Android.mk b/celestron/Android.mk
index 2557f6b90..52340ff76 100644
--- a/celestron/Android.mk
+++ b/celestron/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := celestron.c
 LOCAL_MODULE := celestron
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/drake/Android.mk b/drake/Android.mk
index 4344209e6..92027e489 100644
--- a/drake/Android.mk
+++ b/drake/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := r8a.c r8b.c drake.c
 LOCAL_MODULE := drake
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/dummy/Android.mk b/dummy/Android.mk
index adf71bd02..1e029095c 100644
--- a/dummy/Android.mk
+++ b/dummy/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := dummy.c rot_dummy.c netrigctl.c netrotctl.c
 LOCAL_MODULE := dummy
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/easycomm/Android.mk b/easycomm/Android.mk
index 2ef3895a5..84e2864a5 100644
--- a/easycomm/Android.mk
+++ b/easycomm/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := easycomm.c
 LOCAL_MODULE := easycomm
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ether6/Android.mk b/ether6/Android.mk
new file mode 100644
index 000000000..0655b9dc1
--- /dev/null
+++ b/ether6/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := ether6.c
+LOCAL_MODULE := ether6
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H
+LOCAL_C_INCLUDES := android include src
+LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ether6/Makefile.am b/ether6/Makefile.am
index f2b7026ca..cfc4101b8 100644
--- a/ether6/Makefile.am
+++ b/ether6/Makefile.am
@@ -2,4 +2,4 @@
 noinst_LTLIBRARIES = libhamlib-ether6.la
 libhamlib_ether6_la_SOURCES = ether6.c ether6.h
 
-EXTRA_DIST = README.ether6 ether6.txt
+EXTRA_DIST = README.ether6 ether6.txt Android.mk
diff --git a/flexradio/Android.mk b/flexradio/Android.mk
index fa9d6223b..5f56e060b 100644
--- a/flexradio/Android.mk
+++ b/flexradio/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := flexradio.c sdr1k.c dttsp.c
 LOCAL_MODULE := flexradio
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/fodtrack/Android.mk b/fodtrack/Android.mk
index 614d4ae84..b69f73518 100644
--- a/fodtrack/Android.mk
+++ b/fodtrack/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := fodtrack.c
 LOCAL_MODULE := fodtrack
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/gs232a/Android.mk b/gs232a/Android.mk
index 753425aa2..7e42b2a10 100644
--- a/gs232a/Android.mk
+++ b/gs232a/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := gs232a.c gs232b.c gs232.c
 LOCAL_MODULE := gs232a
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/heathkit/Android.mk b/heathkit/Android.mk
index f17391f25..1a38dbdd4 100644
--- a/heathkit/Android.mk
+++ b/heathkit/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := hd1780.c
 LOCAL_MODULE := heathkit
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/icom/Android.mk b/icom/Android.mk
index 658d51cb8..c5fc6c63d 100644
--- a/icom/Android.mk
+++ b/icom/Android.mk
@@ -14,9 +14,8 @@ LOCAL_SRC_FILES := ic706.c icr8500.c ic735.c ic775.c ic756.c  \
 		icom.c frame.c optoscan.c
 LOCAL_MODULE := icom
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/jrc/Android.mk b/jrc/Android.mk
index 31d3884e4..0c5265178 100644
--- a/jrc/Android.mk
+++ b/jrc/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := nrd535.c nrd545.c nrd525.c jrc.c
 LOCAL_MODULE := jrc
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/kachina/Android.mk b/kachina/Android.mk
index 72d9d1764..c845668e1 100644
--- a/kachina/Android.mk
+++ b/kachina/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := 505dsp.c kachina.c
 LOCAL_MODULE := kachina
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/kenwood/Android.mk b/kenwood/Android.mk
index d3e5b5060..6e480bd92 100644
--- a/kenwood/Android.mk
+++ b/kenwood/Android.mk
@@ -10,9 +10,8 @@ LOCAL_SRC_FILES := ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 		kenwood.c th.c ic10.c elecraft.c transfox.c
 LOCAL_MODULE := kenwood
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/kit/Android.mk b/kit/Android.mk
index 9c6720772..b517f020a 100644
--- a/kit/Android.mk
+++ b/kit/Android.mk
@@ -7,9 +7,8 @@ LOCAL_SRC_FILES := elektor304.c drt1.c dwt.c usrp.c elektor507.c \
 		pcrotor.c kit.c
 LOCAL_MODULE := kit
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/lowe/Android.mk b/lowe/Android.mk
index 64819be69..7370a0a21 100644
--- a/lowe/Android.mk
+++ b/lowe/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := hf235.c lowe.c
 LOCAL_MODULE := lowe
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/m2/Android.mk b/m2/Android.mk
index 9759bce89..d60e87a55 100644
--- a/m2/Android.mk
+++ b/m2/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := rc2800.c
 LOCAL_MODULE := m2
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/pcr/Android.mk b/pcr/Android.mk
index dac5a8dbe..863889765 100644
--- a/pcr/Android.mk
+++ b/pcr/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := pcr1000.c pcr100.c pcr1500.c pcr2500.c pcr.c
 LOCAL_MODULE := pcr
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/prm80/Android.mk b/prm80/Android.mk
index 8e0cc00a1..d3051f126 100644
--- a/prm80/Android.mk
+++ b/prm80/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := prm8060.c prm80.c
 LOCAL_MODULE := prm80
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/racal/Android.mk b/racal/Android.mk
index 7ad23e5c4..e26b04829 100644
--- a/racal/Android.mk
+++ b/racal/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ra6790.c ra3702.c racal.c ra37xx.c
 LOCAL_MODULE := racal
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/rft/Android.mk b/rft/Android.mk
index a45c142cb..d90c5e24c 100644
--- a/rft/Android.mk
+++ b/rft/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ekd500.c rft.c
 LOCAL_MODULE := rft
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/rotorez/Android.mk b/rotorez/Android.mk
index e8fbb966f..b13268845 100644
--- a/rotorez/Android.mk
+++ b/rotorez/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := rotorez.c
 LOCAL_MODULE := rotorez
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/rs/Android.mk b/rs/Android.mk
index 19c740964..302a670d3 100644
--- a/rs/Android.mk
+++ b/rs/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := esmc.c eb200.c rs.c
 LOCAL_MODULE := rs
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/sartek/Android.mk b/sartek/Android.mk
index 6ce28beae..49bbf76c5 100644
--- a/sartek/Android.mk
+++ b/sartek/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := sartek.c
 LOCAL_MODULE := sartek
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skanti/Android.mk b/skanti/Android.mk
index 2c9f9fe26..b13f20fb7 100644
--- a/skanti/Android.mk
+++ b/skanti/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := trp8000.c trp8255.c skanti.c
 LOCAL_MODULE := skanti
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/spid/Android.mk b/spid/Android.mk
index b22dbaea3..1e920d1e9 100644
--- a/spid/Android.mk
+++ b/spid/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := spid.c
 LOCAL_MODULE := spid
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/Android.mk b/src/Android.mk
index d39cccee3..ded4af16d 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -30,6 +30,13 @@ LOCAL_SRC_FILES := \
 LOCAL_MODULE := libhamlib
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include
+LOCAL_STATIC_LIBRARIES := adat alinco amsat aor ars celestron \
+        drake dummy easycomm ether6 flexradio fodtrack \
+        gnuradio gs232a heathkit icom jrc kachina kenwood kit \
+        kylix lowe m2 microtune minivna pcr prm80 racal rft \
+        rotorez rs sartek skanti spid tapr tentec ts7400 tuner \
+        uniden winradio wj yaesu
+
 LOCAL_LDLIBS := -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tapr/Android.mk b/tapr/Android.mk
index a23aae93a..c5a0191bc 100644
--- a/tapr/Android.mk
+++ b/tapr/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := dsp10.c tapr.c
 LOCAL_MODULE := tapr
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/tentec/Android.mk b/tentec/Android.mk
index 62e42709a..6a9935aeb 100644
--- a/tentec/Android.mk
+++ b/tentec/Android.mk
@@ -7,9 +7,8 @@ LOCAL_SRC_FILES := rx320.c rx340.c rx350.c rx331.c \
 		tentec.c tentec2.c tt550.c
 LOCAL_MODULE := tentec
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ts7400/Android.mk b/ts7400/Android.mk
index a72e2d4a8..7069bacdb 100644
--- a/ts7400/Android.mk
+++ b/ts7400/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := ts7400.c
 LOCAL_MODULE := ts7400
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/tuner/Android.mk b/tuner/Android.mk
index 41619d41a..d335f2830 100644
--- a/tuner/Android.mk
+++ b/tuner/Android.mk
@@ -2,12 +2,11 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := v4l.c v4l2.c
+LOCAL_SRC_FILES := tuner.c v4l.c v4l2.c
 LOCAL_MODULE := tuner
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/uniden/Android.mk b/uniden/Android.mk
index fb8e8ae44..748cbeb18 100644
--- a/uniden/Android.mk
+++ b/uniden/Android.mk
@@ -7,9 +7,8 @@ LOCAL_SRC_FILES := bc895.c bc898.c bc245.c pro2052.c bc780.c bc250.c \
 		uniden.c uniden_digital.c
 LOCAL_MODULE := uniden
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/winradio/Android.mk b/winradio/Android.mk
index 8f96b7510..261a16297 100644
--- a/winradio/Android.mk
+++ b/winradio/Android.mk
@@ -3,12 +3,11 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := wr1000.c wr1500.c wr1550.c wr3100.c wr3150.c wr3500.c wr3700.c \
-		g303.c g313.c g305.c winradio.c
+		g303.c g313.c g305.c winradio.c linradio/wrg313api.c
 LOCAL_MODULE := winradio
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/wj/Android.mk b/wj/Android.mk
index 317d4b403..633e4bceb 100644
--- a/wj/Android.mk
+++ b/wj/Android.mk
@@ -5,9 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := wj8888.c wj.c
 LOCAL_MODULE := wj
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/yaesu/Android.mk b/yaesu/Android.mk
index 6a665c30f..5803cc890 100644
--- a/yaesu/Android.mk
+++ b/yaesu/Android.mk
@@ -11,9 +11,8 @@ LOCAL_SRC_FILES := ft100.c ft747.c ft817.c ft847.c ft890.c ft900.c ft920.c \
 
 LOCAL_MODULE := yaesu
 
-LOCAL_MODULE_FILENAME := libhamlib-$(LOCAL_MODULE)
 LOCAL_CFLAGS := -DHAVE_CONFIG_H
 LOCAL_C_INCLUDES := android include src
 LOCAL_LDLIBS := -lhamlib -Lobj/local/armeabi
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)