diff --git a/Makefile.in b/Makefile.in
index 75d7d28..785a2c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../include
 SSL_CFLAGS=@LIBSSL_CFLAGS@
 
 DLL_FLAGS=@DLL_FLAGS@
-LDFLAGS=@LDFLAGS@ -Wl,-soname,@DLLPREFIX@3270@DLLEXT@.@VERSION@
+LDFLAGS=@LDFLAGS@
 
 LIBS=@LIBS@ @LIBSSL_LIBS@ @INTL_LIBS@ @SOCKET_LIBS@
 
@@ -125,7 +125,7 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@
 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@.@VERSION@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@$(LD) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ -o $@ $^ $(LIBS)
 
 $(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@.@VERSION@
 	@rm -f $@
diff --git a/mkfb.c b/mkfb.c
index 29a4eed..73c1888 100644
--- a/mkfb.c
+++ b/mkfb.c
@@ -38,10 +38,12 @@
 #include "../include/lib3270/config.h"
 
 
-#ifdef _WIN32
+#if defined( WIN32 )
 	#include <windows.h>
 	#define tmpfile w32_tmpfile
-#endif // _WIN32
+#elif defined( __APPLE__ )
+	#define tmpfile osx_tmpfile
+#endif // OS
 
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -633,4 +635,30 @@ FILE * w32_tmpfile( void )
 	free(dir);
 	return file;
 }
+#elif defined( __APPLE__ )
+FILE * osx_tmpfile( void )
+{
+	int fd = -1;
+	FILE *file = NULL;
+	
+	do
+	{
+		char *tempname = tempnam(NULL,"XXXXXX");
+		if(!tempname)
+			return NULL;
+		fd = open (tempname,O_CREAT | O_EXCL | O_RDWR,S_IREAD | S_IWRITE);
+	} while (fd < 0 && errno == EEXIST);
+	
+	
+	file = fdopen (fd, "w+b");
+	if (file == NULL)
+	{
+		int save_errno = errno;
+		close (fd);
+		errno = save_errno;
+	}
+	
+	return file;
+}
+
 #endif // _WIN32
--
libgit2 0.21.2