diff --git a/Makefile b/Makefile
index 2ae5c408ed..b9b76837c7 100644
--- a/Makefile
+++ b/Makefile
@@ -155,6 +155,11 @@ $(OBJDIR)/%.o: %.S config.h config.mk $(HEADERS)
 	@$(if $(Q), $(shell echo echo AS $<),)
 	$(Q)$(CC) $(CFLAGS) $(ASFLAGS) $(DEFINES) -c -o $@ $<
 
+$(OBJDIR)/%.o: %.rc $(HEADERS)
+	@mkdir -p $(dir $@)
+	@$(if $(Q), $(shell echo echo WINDRES $<),)
+	$(Q)$(WINDRES) -o $@ $<
+
 install: $(TARGET)
 	rm -f $(OBJDIR)/git_version.o
 	mkdir -p $(DESTDIR)$(PREFIX)/bin 2>/dev/null || /bin/true
diff --git a/Makefile.common b/Makefile.common
index ea67169a93..0e1dc9ad3f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -584,8 +584,8 @@ ifeq ($(HAVE_NETPLAY), 1)
 endif
 
 ifneq ($(findstring Win32,$(OS)),)
-OBJ +=	media/rarch.o \
-			gfx/context/win32_common.o
+   OBJ += media/rarch.o \
+          gfx/context/win32_common.o
 endif
 
 # Record