diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index 8f8333e..354c871 100644
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -49,9 +49,8 @@
     virtual bool runOnModule(Module &M);
   };
 
-  RegisterPass<LoaderPass>
-  X("profile-loader", "Load profile information from llvmprof.out",
-    PassInfo::Analysis|PassInfo::Optimization);
+  RegisterOpt<LoaderPass>
+  X("profile-loader", "Load profile information from llvmprof.out");
 
   RegisterAnalysisGroup<ProfileInfo, LoaderPass> Y;
 }  // End of anonymous namespace
diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp
index 7464c23..5553e24 100644
--- a/lib/VMCore/AsmWriter.cpp
+++ b/lib/VMCore/AsmWriter.cpp
@@ -162,10 +162,10 @@
 
 }  // end namespace llvm
 
-static RegisterPass<PrintModulePass>
-X("printm", "Print module to stderr",PassInfo::Analysis|PassInfo::Optimization);
-static RegisterPass<PrintFunctionPass>
-Y("print","Print function to stderr",PassInfo::Analysis|PassInfo::Optimization);
+static RegisterOpt<PrintModulePass>
+X("printm", "Print module to stderr");
+static RegisterOpt<PrintFunctionPass>
+Y("print","Print function to stderr");
 
 static void WriteAsOperandInternal(std::ostream &Out, const Value *V,
                                    bool PrintName,