diff --git a/Makefile.win32 b/Makefile.win32
index 6efc170f44..1944110975 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -14,7 +14,7 @@ DEFINES = -I.
 LDFLAGS = -L. -static-libgcc -s
 
 SRC_LIBS = -lsamplerate-0
-SDL_LIBS = -lmingw32 -lSDLmain -lSDL
+SDL_LIBS = -lSDL
 SDL_CFLAGS = -ISDL
 
 ifeq ($(HAVE_SRC), 1)
@@ -47,8 +47,8 @@ $(TARGET): $(OBJ)
 %.o: %.c
 	$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 
-ssnes-joyconfig.exe: conf/config_file.o tools/ssnes-joyconfig.o
-	$(CC) -o ssnes-joyconfig.exe conf/config_file.o tools/ssnes-joyconfig.o $(SDL_LIBS) -L. -static-libgcc
+ssnes-joyconfig.exe: conf/config_file.o tools/ssnes-joyconfig.o tools/main-stub.o
+	$(CC) -o ssnes-joyconfig.exe conf/config_file.o tools/ssnes-joyconfig.o $(SDL_LIBS) -L. -static-libgcc tools/main-stub.o
 
 clean:
 	rm -f *.o 
diff --git a/tools/main-stub.c b/tools/main-stub.c
new file mode 100644
index 0000000000..0fb5bf8585
--- /dev/null
+++ b/tools/main-stub.c
@@ -0,0 +1,6 @@
+int real_main(int argc, char *argv[]);
+
+int main(int argc, char *argv[])
+{
+   return real_main(argc, argv);
+}
diff --git a/tools/ssnes-joyconfig.c b/tools/ssnes-joyconfig.c
index 5305729a54..e1928dc68c 100644
--- a/tools/ssnes-joyconfig.c
+++ b/tools/ssnes-joyconfig.c
@@ -250,7 +250,12 @@ static void parse_input(int argc, char *argv[])
 
 }
 
+// Windows is being bitchy.
+#ifdef _WIN32
+int real_main(int argc, char *argv[])
+#else
 int main(int argc, char *argv[])
+#endif
 {
    fprintf(stderr, "hai\n");
    fflush(stderr);