diff --git a/.cvsignore b/.cvsignore
index 515fd386..44ee56dc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-pungi-2.0.17.tar.bz2
+pungi-2.0.18.tar.bz2
diff --git a/import.log b/import.log
index a28e8686..dd171511 100644
--- a/import.log
+++ b/import.log
@@ -16,3 +16,4 @@ pungi-2_0_14-1_fc11:HEAD:pungi-2.0.14-1.fc11.src.rpm:1239664741
 pungi-2_0_15-1_fc11:HEAD:pungi-2.0.15-1.fc11.src.rpm:1242758222
 pungi-2_0_16-1_fc11:HEAD:pungi-2.0.16-1.fc11.src.rpm:1242927301
 pungi-2_0_17-1_fc11:HEAD:pungi-2.0.17-1.fc11.src.rpm:1249941703
+pungi-2_0_18-1_fc12:HEAD:pungi-2.0.18-1.fc12.src.rpm:1252973400
diff --git a/pungi.spec b/pungi.spec
index 04f784e8..100b6ef5 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pungi
-Version:        2.0.17
+Version:        2.0.18
 Release:        1%{?dist}
 Summary:        Distribution compose tool
 
@@ -45,7 +45,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc Authors Changelog COPYING GPL ToDo doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pypungi
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
   %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 %endif
 %{_bindir}/pungi
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 14 2009 Jesse Keating <jkeating@redhat.com> - 2.0.18-1
+- Search for dracut for pkgorder
+
 * Mon Aug 10 2009 Jesse Keating <jkeating@redhat.com> - 2.0.17-1
 - Fix pkgorder to not conflict with yum internals.
 - Remove dead code from splittree
diff --git a/sources b/sources
index c7341057..129a37a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddda59bb1eaaa9ae82818c0d598ba340  pungi-2.0.17.tar.bz2
+fa3d49efb95c12f937aee263502def72  pungi-2.0.18.tar.bz2