diff --git a/.cvsignore b/.cvsignore
index fc76b27..dc4b42a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sqlalchemy-migrate-0.5.3.tar.gz
+sqlalchemy-migrate-0.5.4.tar.gz
diff --git a/python-migrate-py2.4-import.patch b/python-migrate-py2.4-import.patch
deleted file mode 100644
index d533800..0000000
--- a/python-migrate-py2.4-import.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./migrate/versioning/util/__init__.py.orig	2009-06-01 09:52:25.000000000 -0400
-+++ ./migrate/versioning/util/__init__.py	2009-06-01 09:53:23.000000000 -0400
-@@ -6,7 +6,12 @@
-     if isinstance(model, basestring):
-         varname = model.split('.')[-1]
-         modules = '.'.join(model.split('.')[:-1])
--        module = __import__(modules, globals(), {}, ['dummy-not-used'], -1)
-+        try:
-+            module = __import__(modules, globals(), {}, ['dummy-not-used'], -1)
-+        except TypeError:
-+            # The level argument doesn't exist in Python 2.4 and lower
-+            module = __import__(modules, globals(), {}, ['dummy-not-used'])
-+
-         return getattr(module, varname)
-     else:
-         # Assume it's already loaded.
diff --git a/python-migrate-sqlalchemy-migrate.patch b/python-migrate-sqlalchemy-migrate.patch
index 7a689c6..2ac94bf 100644
--- a/python-migrate-sqlalchemy-migrate.patch
+++ b/python-migrate-sqlalchemy-migrate.patch
@@ -1,7 +1,7 @@
-diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
---- sqlalchemy-migrate-0.5.3/setup.py.bak	2009-04-16 10:52:18.000000000 -0700
-+++ sqlalchemy-migrate-0.5.3/setup.py	2009-04-16 10:52:43.000000000 -0700
-@@ -40,8 +40,8 @@ Migrate extends SQLAlchemy to have datab
+diff -up sqlalchemy-migrate-0.5.4/setup.py.bak sqlalchemy-migrate-0.5.4/setup.py
+--- sqlalchemy-migrate-0.5.4/setup.py.bak	2010-04-13 17:48:58.007206349 -0400
++++ sqlalchemy-migrate-0.5.4/setup.py	2010-04-13 17:49:38.058331216 -0400
+@@ -41,8 +41,8 @@ Migrate extends SQLAlchemy to have datab
  
      entry_points = """
      [console_scripts]
@@ -11,4 +11,4 @@ diff -up sqlalchemy-migrate-0.5.3/setup.py.bak sqlalchemy-migrate-0.5.3/setup.py
 +    sqlalchemy-migrate-repository = migrate.versioning.migrate_repository:main
      """,
      test_suite = "nose.collector",
-     tests_require = test_requirements,
+ )
diff --git a/python-migrate.spec b/python-migrate.spec
index e7552aa..1c9a682 100644
--- a/python-migrate.spec
+++ b/python-migrate.spec
@@ -1,10 +1,12 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if !(0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
-%define srcname sqlalchemy-migrate
+%global srcname sqlalchemy-migrate
 
 Name: python-migrate
-Version: 0.5.3
-Release: 3%{?dist}
+Version: 0.5.4
+Release: 1%{?dist}
 Summary: Schema migration tools for SQLAlchemy
 
 Group: Development/Languages
@@ -12,8 +14,7 @@ License: MIT
 URL: http://code.google.com/p/%{srcname}/
 Source0: http://%{srcname}.googlecode.com/files/%{srcname}-%{version}.tar.gz
 # Local patch to rename /usr/bin/migrate to sqlalchemy-migrate
-Patch0: python-migrate-sqlalchemy-migrate.patch
-Patch1: python-migrate-py2.4-import.patch
+Patch0: python-migrate-0.5.4-rename.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,11 +24,13 @@ BuildRequires: python-sqlalchemy
 BuildRequires: python-setuptools-devel
 BuildRequires: python-nose
 BuildRequires: python-sphinx
+BuildRequires: python-decorator
 
 Requires: python-sqlalchemy >= 0.5
 Requires: python-setuptools
+Requires: python-decorator
 
-%if 0%{?fedora} <= 6
+%if 0%{?rhel} && 0%{?rhel} < 6
 BuildRequires: python-sqlite2
 Requires:      python-sqlite2
 %endif
@@ -42,7 +45,6 @@ atabase change sets and database repository versioning.
 %prep
 %setup -q -n %{srcname}-%{version}
 %patch0 -p1 -b .rename
-%patch1 -p0 -b .import
 
 %build
 %{__python} setup.py build
@@ -65,6 +67,9 @@ echo 'sqlite:///__tmp__' > test_db.cfg
 %{python_sitelib}/*
 
 %changelog
+* Tue Apr 20 2010 Martin Bacovsky <mbacovsk@redhat.com> - 0.5.4-1
+- Update to new bugfix release 
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 782fc24..1f64cf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ce48470efac8cbcdf4ee9af725efd70  sqlalchemy-migrate-0.5.3.tar.gz
+7ad9e6d6dd6df701fc596bcb87380271  sqlalchemy-migrate-0.5.4.tar.gz