diff --git a/include/Makefile.include b/include/Makefile.include
index 833a3af6f04..271d92391fa 100644
--- a/include/Makefile.include
+++ b/include/Makefile.include
@@ -86,7 +86,7 @@ SYMBOLS   = -g3 -ggdb3
 PORTABILITY=
 SKIP_WARNING=
 COMBINE_C = -combine -c
-LIBPORTABILITY   = $(TOKUROOT)lib/libportability.$(AEXT)
+LIBPORTABILITY   = $(TOKUROOT)lib/libtokuportability.$(AEXT)
 
 PORTABILITY_HEADERS= $(TOKUROOT)linux
 ALWAYS_LINK= $(LIBPORTABILITY) -lz -lpthread 
diff --git a/linux/Makefile b/linux/Makefile
index 5aad2cffe3e..3d67f3da054 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -9,7 +9,7 @@ OPT_AROPT=-qnoipo #Disable ipo for lib creation even when optimization is on.
 
 SRCS = $(wildcard *.c)
 OBJS = $(patsubst %.c,%.$(OEXT),$(SRCS))
-TARGET = tokulinux.$(AEXT)
+TARGET = libtokuportability.$(AEXT)
 
 install: $(TARGET)
 	$(MAYBEATSIGN)cp $(TARGET) $(LIBPORTABILITY)
diff --git a/linux/tests/Makefile b/linux/tests/Makefile
index 01f511b53fe..2b24c0d9765 100644
--- a/linux/tests/Makefile
+++ b/linux/tests/Makefile
@@ -1,6 +1,6 @@
 CPPFLAGS = -I../../include -I..
 CFLAGS = -Wall -Werror -g -O0
-LDFLAGS = ../tokulinux.a 
+LDFLAGS = ../libtokuportability.a 
 SRCS = $(wildcard test-*.c)
 TARGETS = $(patsubst %.c,%,$(SRCS))
 
diff --git a/windows/Makefile b/windows/Makefile
index 70064ae98c2..f67e7ce30f1 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -10,7 +10,7 @@ OPT_AROPT=-qnoipo #Disable ipo for lib creation even when optimization is on.
 
 SRCS = $(wildcard *.c)
 OBJS = $(patsubst %.c,%.$(OEXT),$(SRCS))
-TARGET = tokuwindows.$(AEXT)
+TARGET = libtokuportability.$(AEXT)
 
 install: $(LIBPORTABILITY)