diff --git a/recipes/rust/files/rust-1.5.0/0001-platform.mk-avoid-choking-on-i586.patch b/recipes/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0001-platform.mk-avoid-choking-on-i586.patch
rename to recipes/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch
diff --git a/recipes/rust/files/rust-1.5.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch b/recipes/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
rename to recipes/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
diff --git a/recipes/rust/files/rust-1.5.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch b/recipes/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
rename to recipes/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
diff --git a/recipes/rust/files/rust-1.5.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
rename to recipes/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
diff --git a/recipes/rust/files/rust-1.5.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch b/recipes/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
rename to recipes/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
diff --git a/recipes/rust/files/rust-1.5.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch b/recipes/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
rename to recipes/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
diff --git a/recipes/rust/files/rust-1.5.0/0007-mk-install-use-disable-rewrite-paths.patch b/recipes/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0007-mk-install-use-disable-rewrite-paths.patch
rename to recipes/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch
diff --git a/recipes/rust/files/rust-1.5.0/0008-install-disable-ldconfig.patch b/recipes/rust/files/rust/0008-install-disable-ldconfig.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0008-install-disable-ldconfig.patch
rename to recipes/rust/files/rust/0008-install-disable-ldconfig.patch
diff --git a/recipes/rust/files/rust-1.5.0/0009-Remove-crate-metadata-from-symbol-hashing.patch b/recipes/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch
similarity index 100%
rename from recipes/rust/files/rust-1.5.0/0009-Remove-crate-metadata-from-symbol-hashing.patch
rename to recipes/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch
diff --git a/recipes/rust/rust-git.inc b/recipes/rust/rust-git.inc
deleted file mode 100644
index 831ee68..0000000
--- a/recipes/rust/rust-git.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SRC_URI = "\
-	gitsm://github.com/rust-lang/rust.git;protocol=https \
-"
-S = "${WORKDIR}/git"
-PV .= "+git${SRCPV}"
-require rust.inc
-
diff --git a/recipes/rust/rust-llvm_1.5.0.bb b/recipes/rust/rust-llvm.bb
similarity index 90%
rename from recipes/rust/rust-llvm_1.5.0.bb
rename to recipes/rust/rust-llvm.bb
index f1e2660..914f468 100644
--- a/recipes/rust/rust-llvm_1.5.0.bb
+++ b/recipes/rust/rust-llvm.bb
@@ -1,5 +1,5 @@
 require rust-release.inc
-require rust-${PV}.inc
+require rust-version.inc
 require rust-llvm.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
diff --git a/recipes/rust/rust-1.5.0.inc b/recipes/rust/rust-version.inc
similarity index 95%
rename from recipes/rust/rust-1.5.0.inc
rename to recipes/rust/rust-version.inc
index 117b8b8..f691fd3 100644
--- a/recipes/rust/rust-1.5.0.inc
+++ b/recipes/rust/rust-version.inc
@@ -1,3 +1,4 @@
+PV = "1.5.0"
 SRC_URI[rust.md5sum] = "234bd912481a04e93b7f2eff0d5b3485"
 SRC_URI[rust.sha256sum] = "641037af7b7b6cad0b231cc20671f8a314fbf2f40fc0901d0b877c39fc8da5a0"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=eb87dba71cb424233bcce88db3ae2f1a"
diff --git a/recipes/rust/rust.bb b/recipes/rust/rust.bb
new file mode 100644
index 0000000..85d7cd1
--- /dev/null
+++ b/recipes/rust/rust.bb
@@ -0,0 +1,17 @@
+require rust-release.inc
+require rust.inc
+require rust-version.inc
+
+SRC_URI_append = "\
+        file://rust/0001-platform.mk-avoid-choking-on-i586.patch \
+        file://rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
+        file://rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
+        file://rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
+        file://rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
+        file://rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch \
+        file://rust/0007-mk-install-use-disable-rewrite-paths.patch \
+        file://rust/0008-install-disable-ldconfig.patch \
+        file://rust/0009-Remove-crate-metadata-from-symbol-hashing.patch \
+\
+	file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
+"
diff --git a/recipes/rust/rust_1.5.0.bb b/recipes/rust/rust_1.5.0.bb
deleted file mode 100644
index 2a2fdca..0000000
--- a/recipes/rust/rust_1.5.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require rust-release.inc
-require rust.inc
-require rust-${PV}.inc
-
-# "patch-prefix"
-PP = "rust-${PV}"
-SRC_URI_append = "\
-        file://${PP}/0001-platform.mk-avoid-choking-on-i586.patch \
-        file://${PP}/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
-        file://${PP}/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch \
-        file://${PP}/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
-        file://${PP}/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch \
-        file://${PP}/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch \
-        file://${PP}/0007-mk-install-use-disable-rewrite-paths.patch \
-        file://${PP}/0008-install-disable-ldconfig.patch \
-        file://${PP}/0009-Remove-crate-metadata-from-symbol-hashing.patch \
-\
-	file://rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch;patchdir=src/rust-installer \
-"