diff --git a/lib/Target/PIC16/PIC16Passes/Makefile b/lib/Target/PIC16/PIC16Passes/Makefile
index 3ddcaaaad99..9684b8d2cae 100644
--- a/lib/Target/PIC16/PIC16Passes/Makefile
+++ b/lib/Target/PIC16/PIC16Passes/Makefile
@@ -8,9 +8,8 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
 TARGET = PIC16
-LIBRARYNAME = PIC16Passes
-LOADABLE_MODULE = 1
-
+LIBRARYNAME = LLVMpic16passes
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/lib/Target/PIC16/PIC16Passes/PIC16Overlay.cpp b/lib/Target/PIC16/PIC16Passes/PIC16Overlay.cpp
index c94d7fa8dc1..197c3987d29 100644
--- a/lib/Target/PIC16/PIC16Passes/PIC16Overlay.cpp
+++ b/lib/Target/PIC16/PIC16Passes/PIC16Overlay.cpp
@@ -25,8 +25,7 @@ using namespace llvm;
 
 namespace llvm {
   char PIC16FrameOverlay::ID = 0;
-  static RegisterPass<PIC16FrameOverlay>
-  X("pic16overlay", "PIC16 Frame Overlay Analysis");
+  ModulePass *createPIC16OverlayPass() { return new PIC16FrameOverlay(); }
 }
 
 void PIC16FrameOverlay::getAnalysisUsage(AnalysisUsage &AU) const {