diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
index c9e8040d7..7a202f98f 100644
--- a/project/jni/sdl_mixer/Android.mk
+++ b/project/jni/sdl_mixer/Android.mk
@@ -8,18 +8,18 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include $(
 					$(LOCAL_PATH)/../mad/include $(LOCAL_PATH)/../flac/include $(LOCAL_PATH)/../ogg/include \
 					$(LOCAL_PATH)/../vorbis/include $(LOCAL_PATH)/../tremor/include $(LOCAL_PATH)/../mikmod/include \
 					$(LOCAL_PATH)/timidity 
-LOCAL_CFLAGS := -O3 \
-				-DWAV_MUSIC -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC -DMID_MUSIC -DUSE_TIMIDITY_MIDI
+LOCAL_CFLAGS := -O3 -DWAV_MUSIC -DOGG_MUSIC -DFLAC_MUSIC -DMOD_MUSIC -DMID_MUSIC -DUSE_TIMIDITY_MIDI
 
 LOCAL_CPP_EXTENSION := .cpp
 
-LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c)) $(addprefix timidity/, $(notdir $(wildcard $(LOCAL_PATH)/timidity/*.c)))
+LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
 
 LOCAL_SHARED_LIBRARIES := sdl-$(SDL_VERSION)
 LOCAL_STATIC_LIBRARIES := flac mikmod
 
 LOCAL_LDLIBS := -llog
 
+LOCAL_STATIC_LIBRARIES += timidity_sdl_mixer
 ifeq "$(TARGET_ARCH_ABI)" "armeabi"
 LOCAL_CFLAGS += -DOGG_USE_TREMOR
 LOCAL_STATIC_LIBRARIES += tremor
@@ -35,3 +35,13 @@ endif
 
 include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+
+# Separate timidity, so it won't get rebuilt too often
+LOCAL_MODULE := timidity_sdl_mixer
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/timidity $(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include
+LOCAL_CFLAGS := -O3
+LOCAL_SRC_FILES := $(addprefix timidity/, $(notdir $(wildcard $(LOCAL_PATH)/timidity/*.c)))
+LOCAL_LDLIBS := -llog
+
+include $(BUILD_STATIC_LIBRARY)