diff --git a/src/secp256k1/Makefile.am b/src/secp256k1/Makefile.am
--- a/src/secp256k1/Makefile.am
+++ b/src/secp256k1/Makefile.am
@@ -1,11 +1,9 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 
-lib_LTLIBRARIES = libsecp256k1.la
+SECP256K1_LIB = libsecp256k1.la
+lib_LTLIBRARIES = $(SECP256K1_LIB)
 if USE_JNI
-JNI_LIB = libsecp256k1_jni.la
-noinst_LTLIBRARIES = $(JNI_LIB)
-else
-JNI_LIB =
+lib_LTLIBRARIES += libsecp256k1_jni.la
 endif
 include_HEADERS = include/secp256k1.h
 noinst_HEADERS =
@@ -72,10 +70,11 @@
 
 libsecp256k1_la_SOURCES = src/secp256k1.c
 libsecp256k1_la_CPPFLAGS = -DSECP256K1_BUILD -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
-libsecp256k1_la_LIBADD = $(JNI_LIB) $(SECP_LIBS) $(COMMON_LIB)
+libsecp256k1_la_LIBADD = $(SECP_LIBS) $(COMMON_LIB)
 
 libsecp256k1_jni_la_SOURCES  = src/java/org_bitcoin_NativeSecp256k1.c src/java/org_bitcoin_Secp256k1Context.c
 libsecp256k1_jni_la_CPPFLAGS = -DSECP256K1_BUILD $(JNI_INCLUDES)
+libsecp256k1_jni_la_LIBADD = $(SECP256K1_LIB)
 
 noinst_PROGRAMS =
 if USE_BENCHMARK
@@ -134,7 +133,7 @@
 
 if USE_TESTS
 
-check-java: libsecp256k1.la .stamp-java
+check-java: libsecp256k1_jni.la .stamp-java
 	$(AM_V_at)java -Djava.library.path="./:./src:./src/.libs:.libs/" -enableassertions -cp "$(JAVA_BUILD)" $(JAVA_ORG)/NativeSecp256k1Test
 
 endif
diff --git a/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java b/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java
--- a/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java
+++ b/src/secp256k1/src/java/org/bitcoin/Secp256k1Context.java
@@ -28,7 +28,7 @@
       boolean isEnabled = true;
       long contextRef = -1;
       try {
-          System.loadLibrary("secp256k1");
+          System.loadLibrary("secp256k1_jni");
           contextRef = secp256k1_init_context();
       } catch (UnsatisfiedLinkError e) {
           System.out.println("UnsatisfiedLinkError: " + e.toString());