diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index ab6762708fc1..9a8e230c5e73 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
+OLD_FILES+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile
index b8aa4df64c67..51509f71d71f 100644
--- a/lib/libelf/Makefile
+++ b/lib/libelf/Makefile
@@ -7,6 +7,7 @@ SRCDIR=	${TOP}/libelf
 .PATH:	${SRCDIR}
 
 LIB=	elf
+SHLIBDIR?= /lib
 
 SRCS=	elf.c							\
 	elf_begin.c						\