--- library/Makefile
+++ library/Makefile
@@ -43,9 +43,10 @@
 VERSION=0.0.0
 VERSION_MAJOR=$(word 1,$(subst ., ,$(VERSION)))
 VERSION_MINOR=$(word 2,$(subst ., ,$(VERSION)))
-LIB_SO=libpolarssl.$(DLEXT)
+LIB_SO=libpolarssl$(VERSION_MAJOR)$(VERSION_MINOR).$(DLEXT)
 LIB_SO_VERSION=$(LIB_SO).$(VERSION)
 LIB_SO_SONAME=$(LIB_SO).$(VERSION_MAJOR).$(VERSION_MINOR)
+LIB_A=libpolarssl$(VERSION_MAJOR)$(VERSION_MINOR).a
 
 OBJS=	aes.o		aesni.o		arc4.o			\
 		asn1parse.o								\
@@ -84,11 +85,11 @@
 all: shared static
 endif
 
-static: libpolarssl.a
+static: $(LIB_A)
 
 shared: $(LIB_SO_VERSION)
 
-libpolarssl.a: $(OBJS)
+$(LIB_A): $(OBJS)
 	echo "  AR    $@"
 	$(AR) -rc $@ $(OBJS)
 	echo "  RL    $@"
@@ -114,7 +115,7 @@
 
 clean:
 ifndef WINDOWS
-	rm -f *.o libpolarssl.*
+	rm -f *.o libpolarssl*.*
 endif
 ifdef WINDOWS
 	del /Q /F *.o libpolarssl.*