diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 65124ceff1d..d5d754748f1 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -55,6 +55,7 @@ pub mod back {
     pub use rustc_back::arm;
     pub use rustc_back::mips;
     pub use rustc_back::mipsel;
+    pub use rustc_back::rpath;
     pub use rustc_back::svh;
     pub use rustc_back::target_strs;
     pub use rustc_back::x86;
@@ -63,7 +64,6 @@ pub mod back {
     pub mod archive;
     pub mod link;
     pub mod lto;
-    pub mod rpath;
 
 }
 >>>>>>> Extract librustc_back from librustc
diff --git a/src/librustc_back/lib.rs b/src/librustc_back/lib.rs
index 5334c499300..156a419bb2d 100644
--- a/src/librustc_back/lib.rs
+++ b/src/librustc_back/lib.rs
@@ -33,6 +33,7 @@ pub mod abi;
 pub mod arm;
 pub mod mips;
 pub mod mipsel;
+pub mod rpath;
 pub mod svh;
 pub mod target_strs;
 pub mod x86;
diff --git a/src/librustc/back/rpath.rs b/src/librustc_back/rpath.rs
similarity index 100%
rename from src/librustc/back/rpath.rs
rename to src/librustc_back/rpath.rs