diff --git a/make/makefile b/make/makefile
index 4e1b0a2..1b609e6 100644
--- a/make/makefile
+++ b/make/makefile
@@ -16,8 +16,11 @@ else
 	ifeq ($(UNAME_S), Darwin)
 
 		linklibs = -lpthread
-  	else
+	else
+		# MSVC
 		linklibs = -lrt -lpthread
+		# MinGW
+		#linklibs = -lversion -lpthread
 	endif
 endif
  
@@ -31,7 +34,7 @@ endif
 	rm -f $@.$$$$
 
 ../bin/oscar64 : $(objects)
-	$(CXX) $(CPPFLAGS) $(linklibs) $(objects) -o ../bin/oscar64
+	$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o ../bin/oscar64
 
 .PHONY : clean
 clean :
diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp
index 207c9fb..04ba2c4 100644
--- a/oscar64/oscar64.cpp
+++ b/oscar64/oscar64.cpp
@@ -567,16 +567,19 @@ int main(int argc, const char** argv)
 {
 #if 1
 #ifdef _WIN32
+#ifndef __GNUC__
 #ifndef _DEBUG
 	__try 
 	{
 #endif
 #endif
+#endif
 #endif
 		return main2(argc, argv);
 
 #if 1
 #ifdef _WIN32
+#ifndef __GNUC__
 #ifndef _DEBUG
 }
 	__except (seh_filter(GetExceptionCode(), GetExceptionInformation()))
@@ -586,4 +589,5 @@ int main(int argc, const char** argv)
 #endif
 #endif
 #endif
+#endif
 }