diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index b3a28d09..f48f1189 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -55,7 +55,7 @@ com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class  $(java_las
 libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(AM_CFLAGS) @JAVA_INCLUDE@
 libjnilasso_la_CFLAGS += -Wno-unused-parameter
 
-libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version
+libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version $(JNI_EXTRA_LDFLAGS)
 libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS)
 nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c 
 
@@ -105,8 +105,8 @@ AllJunitTests: JAVAFLAGS +="-Dsrcdir=$(srcdir)"
 AllJunitTests: $(test_source_files:.java=.class) 	
 	echo "#! /bin/sh" > $@
 	echo "OBJDIR=`libtool --config | grep ^objdir | sed s/.*=//`" >> $@
-	echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ BindingTests' >> $@
-	echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ LoginTest' >> $@
+	echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR BindingTests' >> $@
+	echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR LoginTest' >> $@
 	chmod +x $@
 endif
 
diff --git a/configure.ac b/configure.ac
index 526df6d3..6db53848 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,12 @@ else
   JAVA_VERSION=""
 fi
 
+dnl Support JNI under MacOsX
+case $host_os in
+*-darwin*)
+    JNI_EXTRA_LDFLAGS="-shrext .jnilib" ;;
+esac
+
 dnl Conditional java sub dir test.
 AM_CONDITIONAL([JAVA_ENABLED],[test "x$enable_java" = "xyes"])
 AM_CONDITIONAL([JUNIT_ENABLED],[test "x$JUNIT" != "x"])
@@ -332,6 +338,7 @@ AC_SUBST(JAVA_INCLUDE)
 AC_SUBST(CLASSPATH_OPT)
 JDK_INCLUDE=$JAVA_INCLUDE
 AC_SUBST(JDK_INCLUDE)
+AC_SUBST(JNI_EXTRA_LDFLAGS)
 
 
 # --------------