diff --git a/.gitignore b/.gitignore
index 7586d2d..050814f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdelibs-4.5.2.tar.bz2
 /kdelibs-4.5.3.tar.bz2
+/kdelibs-4.5.4.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index 2884314..cc68dff 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,18 +1,22 @@
-
-%define attica_ver 0.1.4
-%define dbusmenu_qt_ver 0.5.2
-%define phonon_ver 4.4.2
-%define qt4_ver 4.6.2
-%define soprano_ver 2.5.0
-%define strigi_ver 0.7.2
+%global attica_ver 0.1.4
+%global dbusmenu_qt_ver 0.5.2
+%global phonon_ver 4.4.2
+%global qt4_ver 4.6.2
+%global soprano_ver 2.5.0
+%global strigi_ver 0.7.2
 # to build/include apidocs or not
-%define apidocs 1
+%global apidocs 1
 # to build/include QCH apidocs or not (currently broken)
 #define apidocs_qch 1
 
+%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
+%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
+%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
+%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
+
 Summary: KDE Libraries
-Version: 4.5.3
-Release: 3%{?dist}
+Version: 4.5.4
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -30,8 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kde4-macros(api) >= 2
 BuildRequires: kde-filesystem >= 4-23
 BuildRequires: docbook-dtds docbook-style-xsl
+
 Requires: ca-certificates
-%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
 Requires: docbook-dtds docbook-style-xsl
 Requires: hicolor-icon-theme
@@ -44,39 +48,47 @@ Requires: hal
 Requires: hunspell
 # beware of possible bootstrapping problems -- Rex
 Requires: oxygen-icon-theme >= %{version}
-%global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
 Requires: phonon%{?_isa} >= %{phonon_version} 
 Requires: shared-desktop-ontologies
 Requires: shared-mime-info
-%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
 Requires: soprano%{?_isa} >= %{soprano_version} 
-%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
 Requires: strigi-libs%{?_isa} >= %{strigi_version} 
 
 # make -devel packages parallel-installable
 Patch0: kdelibs-4.4.85-parallel_devel.patch
+
 # fix kde#149705
 Patch2: kdelibs-4.2.85-kde149705.patch
+
 # install all .css files and Doxyfile.global in kdelibs-common to build
 # kdepimlibs-apidocs against
 Patch8: kdelibs-4.3.90-install_all_css.patch
+
 # add Fedora/V-R to KHTML UA string
 Patch9: kdelibs-4.0.2-branding.patch
+
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
+
 # workaround for policykit
 Patch11: kdelibs-4.4.80-policykit-workaround.patch
-# COMMENT ME PLEASE 
+
+# fedora/rhel applications menu
 Patch12: kdelibs-4.1.0-xdg-menu.patch
+
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.4.80-libexecdir.patch
+
 # kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
-# COMMENT ME PLEASE
+
+# set correct build type
 Patch20: kdelibs-4.1.70-cmake.patch
+
 # disable drkonqi by default, RHEL prefers/wants abrt
 Patch24: kdelibs-4.3.1-drkonq.patch
+
 # die rpath die, since we're using standard paths, we can avoid
 # this extra hassle (even though cmake is *supposed* to not add standard
 # paths (like /usr/lib64) already! With this, we can drop
@@ -246,8 +258,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %patch2 -p1 -b .kde149705
 %patch8 -p1 -b .install_all_css
 %patch9 -p1 -b .branding
-# add release version as part of branding (suggested by cailon)
-sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 %patch11 -p1 -b .policykit-workaround
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
@@ -261,16 +271,19 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 # upstreamable patches
 %patch50 -p1 -b .knewstuff_gpg2
 
-# upstream patches
+# upstream patches, stable branch
 %patch100 -p4 -b .kde246652
+
+# upstream patches, trunk
 %patch151 -p3 -b .plasma_wallpaper_configchanged
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
 
+# add release version as part of branding (suggested by cailon)
+sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
@@ -508,6 +521,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 29 2010 Than Ngo <than@redhat.com> - 4.5.4-1
+- 4.5.4
+
 * Mon Nov 15 2010 Rex Dieter <rdieter@fedoraproject.org> -  4.5.3-3
 - Closing a konsolepart shell crashes (kde#256652)
 
diff --git a/sources b/sources
index 8371f31..084790c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f412739c8e9bdb7b92487ee79ba3b5bd  kdelibs-4.5.3.tar.bz2
+ec53cec3dabe8fa335a71b16fb0cdc95  kdelibs-4.5.4.tar.bz2