diff --git a/firmware/Makefile b/firmware/Makefile
index 6c9084d6f9..8d81d73e42 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -44,8 +44,9 @@ OUTPUT = $(OBJDIR)/librockbox.a
 $(OUTPUT): $(OBJS)
 	$(AR) ruv $@ $+
 
-.c.o:
-	$(CC) $(CFLAGS) -c $< -o $(OBJDIR)/$@
+$(OBJDIR)/%.o: %.c
+	@mkdir -p `dirname $@`
+	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
 	-$(RM) -f $(OBJDIR)/$(OBJS) *~ $(OUTPUT)