diff --git a/Makefile b/Makefile
index b5bdc58..e1e0b2e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,21 @@ a3tg.pbo: $(ARMASRC)
 liba3tg.so: $(GOSRC)
 	cd extension && GOARCH=386 CGO_ENABLED=1 go build $(LDFLAGS) -o ../liba3tg.so -buildmode=c-shared .
 
+liba3tg_x64.so: $(GOSRC)
+	cd extension && GOARCH=amd64 CGO_ENABLED=1 go build $(LDFLAGS) -o ../liba3tg_x64.so -buildmode=c-shared .
+
 liba3tg.dll: $(GOSRC)
 	cd extension && GOOS=windows GOARCH=386 CC=i686-w64-mingw32-cc CGO_ENABLED=1 go build $(LDFLAGS) -o ../liba3tg.dll -buildmode=c-shared .
 
 liba3tg_x64.dll: $(GOSRC)
 	cd extension && GOOS=windows GOARCH=amd64 CC=x86_64-w64-mingw32-cc CGO_ENABLED=1 go build $(LDFLAGS) -o ../liba3tg_x64.dll -buildmode=c-shared .
 
-build: liba3tg.so liba3tg.dll liba3tg_x64.dll a3tg.pbo
+build: liba3tg.so liba3tg_x64.so liba3tg.dll liba3tg_x64.dll a3tg.pbo
 
 clean:
 	-rm a3tg.pbo
 	-rm ./liba3tg.so
+	-rm ./liba3tg_x64.so
 	-rm ./liba3tg.dll
 	-rm ./liba3tg_x64.dll
 	-rm ./liba3tg.h
diff --git a/extension/liba3tg.go b/extension/liba3tg.go
index 62a8937..bf99ff5 100644
--- a/extension/liba3tg.go
+++ b/extension/liba3tg.go
@@ -12,7 +12,11 @@ package main
   }
 
   #if __x86_64__
-	static inline unsigned long long min(unsigned long long a, unsigned long long b) { return a < b ? a : b; }
+	#ifdef __MINGW32__
+      static inline unsigned long long min(unsigned long long a, unsigned long long b) { return a < b ? a : b; }
+	#else
+      static inline unsigned long min(unsigned long a, unsigned long b) { return a < b ? a : b; }
+	#endif
   #else
     static inline unsigned int min(unsigned int a, unsigned int b) { return a < b ? a : b; }
   #endif