diff --git a/component/busybox/buildout.cfg b/component/busybox/buildout.cfg
index c13db298ce51d9405c48e161cf2c9a05dab4eaac..4706e13644f5590b224400853d88f9e2fe5c7082 100644
--- a/component/busybox/buildout.cfg
+++ b/component/busybox/buildout.cfg
@@ -2,19 +2,12 @@
 
 parts = busybox
 
-[busybox-patch-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 292498db86c46e101bb14bf2c74c36f0
-download-only = true
-filename = busybox-1_20_2.patch
-
 [busybox]
 recipe = slapos.recipe.build
 url = http://git.busybox.net/busybox/snapshot/busybox-1_20_2.tar.gz
 md5sum = 025acebb48040ef62dd635d416d317e8
 patches =
-    ${busybox-patch-download:location}/${busybox-patch-download:filename}
+    ${:_profile_base_location_}/busybox-1_20_2.patch#292498db86c46e101bb14bf2c74c36f0
 script =
     extract_dir = self.extract(self.download(%(url)r, %(md5sum)r))
     workdir = guessworkdir(extract_dir)
diff --git a/component/ffmpeg/buildout.cfg b/component/ffmpeg/buildout.cfg
index 22935ca702b568532c5817a07c6e2f79a5bb4ed7..fc9b8d57b37e2ca10cf6fa9e627ec6858f8d6aa2 100644
--- a/component/ffmpeg/buildout.cfg
+++ b/component/ffmpeg/buildout.cfg
@@ -1,12 +1,12 @@
 [buildout]
-extends = 
+extends =
   ../bzip2/buildout.cfg
   ../libpng/buildout.cfg
   ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../zlib/buildout.cfg
 
-parts = 
+parts =
   ffmpeg
 
 [ffmpeg]
@@ -25,28 +25,23 @@ url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
 md5sum = 798a4211221073c1409f26eac4567e8b
 configure-options =
   --disable-static
-environment = 
+environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
 
-[libtheora-png_sizeof.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-filename = libtheora-png_sizeof.patch
-md5sum = eaa1454081b50f05b59495a12f52b0d5
-download-only = true
-
 [libtheora]
 recipe = slapos.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
 depends =
   ${libpng:so_version}
-patches = ${libtheora-png_sizeof.patch:location}/${libtheora-png_sizeof.patch:filename}
+patches =
+  ${:_profile_base_location_}/libtheora-png_sizeof.patch#eaa1454081b50f05b59495a12f52b0d5
+
 patch-options = -p1
 configure-options =
   --disable-static
-environment = 
+environment =
   PATH=${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig
 
@@ -58,9 +53,9 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
 recipe = slapos.recipe.cmmi
 url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2
 md5sum = 383f3f07a76099682abb43f79b692b72
-configure-options = 
+configure-options =
  --enable-shared
-environment = 
+environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [libx264]
@@ -70,7 +65,7 @@ md5sum = f86260b2ea6d6cb5186937c9363891d7
 configure-options =
   --enable-shared
   --enable-pic
-environment = 
+environment =
   PATH=${yasm:location}/bin:%(PATH)s
 
 [lame]
@@ -92,7 +87,7 @@ configure-options =
 recipe = slapos.recipe.cmmi
 url = http://ffmpeg.org/releases/ffmpeg-0.8.5.tar.bz2
 md5sum = 726877b19ece7ea64def8b7e6727e182
-configure-options = 
+configure-options =
  --enable-gpl
  --enable-version3
  --enable-postproc
@@ -108,7 +103,7 @@ configure-options =
  --enable-zlib
  --disable-static
  --extra-ldflags="-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib"
-environment = 
+environment =
   CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${libx264:location}/include -I${lame:location}/include -I${opencore-amr:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath=${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   PATH=${yasm:location}/bin:%(PATH)s
diff --git a/component/shellinabox/buildout.cfg b/component/shellinabox/buildout.cfg
index a21078a99e2d81c0525709742141a46105af10a5..b6e9f991631d5a5119deb0df25116b8686e636ec 100644
--- a/component/shellinabox/buildout.cfg
+++ b/component/shellinabox/buildout.cfg
@@ -6,19 +6,6 @@ extends =
 
 parts = shellinabox
 
-[shellinabox-full-path-patch]
-recipe = hexagonit.recipe.download
-filename = 0002-Allow-to-run-entire-command-path.patch
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
-
-[shellinabox-ipv6-patch]
-recipe = hexagonit.recipe.download
-filename = 0001-Switch-to-IPv6.patch
-url = ${:_profile_base_location_}/${:filename}
-download-only = true
-
 [shellinabox]
 recipe = slapos.recipe.cmmi
 url = http://shellinabox.googlecode.com/files/shellinabox-2.10.tar.gz
@@ -30,5 +17,5 @@ environment =
 patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-    ${shellinabox-ipv6-patch:location}/${shellinabox-ipv6-patch:filename}
-    ${shellinabox-full-path-patch:location}/${shellinabox-full-path-patch:filename}
+    ${:_profile_base_location_}/0001-Switch-to-IPv6.patch#b61cb099c00e15a5fcaf6c98134fff45
+    ${:_profile_base_location_}/0002-Allow-to-run-entire-command-path.patch#a506b4d83021e24c830f767501c1d3fc