diff --git a/abrt.spec b/abrt.spec
index 893c8aa..f34f577 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -7,10 +7,16 @@
     %bcond_with systemd
 %endif
 
+%if 0%{?rhel} >= 6
+%define vendor redhat
+%else
+%define vendor fedora
+%endif
+
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 2.0.4
-Release: 5%{?dist}
+Version: 2.0.4.980
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -18,14 +24,9 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 Source1: abrt.init
 Source2: abrt-ccpp.init
 Source3: abrt-oops.init
-Source4: abrt1_to_abrt2
-Patch0: 0001-abrt-gui-launch-reporter-children-with-LIBREPORT_GET.patch
-Patch1: 0002-gui-split-the-main-window-in-2-panes-reported-not-re.patch
-Patch2: 0004-install-debuginfo-ask-before-downloading.patch
-Patch3: blacklist.patch
-Patch4: enable_bz_for_oops.patch
-Patch5: null_deref.patch
-Patch6: free_space_check.patch
+Source4: abrt-vmcore.init
+Source5: abrt1_to_abrt2
+Patch0: blacklist.patch
 BuildRequires: dbus-devel
 BuildRequires: gtk2-devel
 BuildRequires: rpm-devel >= 4.6
@@ -105,6 +106,16 @@ Requires: %{name} = %{version}-%{release}
 This package contains hook for C/C++ crashed programs and %{name}'s C/C++
 analyzer plugin.
 
+%package retrace-client
+Summary: %{name}'s retrace client
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description retrace-client
+This package contains the client application for Retrace server
+which is able to analyze C/C++ crashes remotely.
+
+
 %package addon-kerneloops
 Summary: %{name}'s kerneloops addon
 Group: System Environment/Libraries
@@ -118,6 +129,16 @@ Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
 %description addon-kerneloops
 This package contains plugin for collecting kernel crash information.
 
+%package addon-vmcore
+Summary: %{name}'s vmcore addon
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: abrt-addon-kerneloops
+
+%description addon-vmcore
+This package contains plugin for collecting kernel crash information from vmcore files.
+
+
 %package addon-python
 Summary: %{name}'s addon for catching and analyzing Python exceptions
 Group: System Environment/Libraries
@@ -153,7 +174,9 @@ Group: User Interface/Desktops
 # any tweaking in abrt.conf (IOW: all plugins mentioned there must be installed)
 Requires: %{name} = %{version}-%{release}
 Requires: abrt-addon-kerneloops
-Requires: abrt-addon-ccpp, abrt-addon-python
+Requires: abrt-addon-vmcore
+Requires: abrt-addon-ccpp
+Requires: abrt-addon-python
 # Default config of addon-ccpp requires gdb
 Requires: gdb >= 7.0-3
 Requires: abrt-gui
@@ -167,13 +190,9 @@ Virtual package to make easy default installation on desktop environments.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1 -b .oops_to_bz
-%patch5 -p1 -b .sigsegv
-%patch6 -p1 -b .free_space_check
+# Fedora specific
+%patch0 -p1 -b .blacklist
+# general fixes
 
 %build
 autoconf
@@ -195,18 +214,17 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
 install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-ccpp
 install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-oops
+install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-vmcore
 %endif
-install -m 755 %SOURCE4 ${RPM_BUILD_ROOT}/%{_libexecdir}/abrt1-to-abrt2
+install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_libexecdir}/abrt1-to-abrt2
 mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di
 mkdir -p $RPM_BUILD_ROOT/var/run/abrt
 mkdir -p $RPM_BUILD_ROOT/var/spool/abrt
 mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload
-# compat before we split abrt-cli and report-cli
-ln -s %{_bindir}/report-cli $RPM_BUILD_ROOT/%{_bindir}/abrt-cli
 
 desktop-file-install \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-        --vendor fedora \
+        --vendor %{vendor} \
         --delete-original \
         ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
@@ -220,6 +238,9 @@ rm -f %{buildroot}%{_infodir}/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+make check
+
 %pre
 #uidgid pair 173:173 reserved in setup rhbz#670231
 %define abrt_gid_uid 173
@@ -286,6 +307,17 @@ if [ $1 -gt 1 ]; then # Is this an upgrade?
    fi
 fi
 
+%post addon-vmcore
+if [ $1 -eq 1 ]; then
+%if %{with systemd}
+    # Enable (but don't start) the units by default
+    /bin/systemctl enable abrt-vmcore.service >/dev/null 2>&1 || :
+%else
+    /sbin/chkconfig --add abrt-vmcore
+%endif
+fi
+
+
 %preun
 if [ "$1" -eq "0" ] ; then
 %if %{with systemd}
@@ -319,6 +351,17 @@ if [ "$1" -eq "0" ] ; then
 %endif
 fi
 
+%preun addon-vmcore
+if [ "$1" -eq "0" ] ; then
+%if %{with systemd}
+    /bin/systemctl --no-reload abrt-vmcore.service >/dev/null 2>&1 || :
+    /bin/systemctl stop abrt-vmcore.service >/dev/null 2>&1 || :
+%else
+    service abrt-vmcore stop >/dev/null 2>&1
+    /sbin/chkconfig --del abrt-vmcore
+%endif
+fi
+
 %if %{with systemd}
 %postun
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -326,6 +369,9 @@ fi
 %postun addon-kerneloops
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
+%postun addon-vmcore
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
 %postun addon-ccpp
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
@@ -354,6 +400,9 @@ service abrt-ccpp condrestart >/dev/null 2>&1 || :
 %posttrans addon-kerneloops
 service abrt-oops condrestart >/dev/null 2>&1 || :
 
+%posttrans addon-vmcore
+service abrt-vmcore condrestart >/dev/null 2>&1 || :
+
 %posttrans gui
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -367,9 +416,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 %{_sbindir}/abrtd
 %{_sbindir}/abrt-server
+%{_libexecdir}/abrt-handle-event
 %{_bindir}/abrt-handle-upload
 %{_bindir}/abrt-action-save-package-data
-%{_bindir}/abrt-retrace-client
 %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf
 %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf
 %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
@@ -386,11 +435,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 #%dir %{_libdir}/%{name}
+%{_mandir}/man1/abrt-handle-upload.1.gz
+%{_mandir}/man1/abrt-server.1.gz
+%{_mandir}/man1/abrt-action-save-package-data.1.gz
 %{_mandir}/man8/abrtd.8.gz
 %{_mandir}/man5/abrt.conf.5.gz
-%{_mandir}/man5/abrt_event.conf.5.gz
+%{_mandir}/man5/abrt-action-save-package-data.conf.5.gz
 # {_mandir}/man5/pyhook.conf.5.gz
-%{_mandir}/man7/abrt-plugins.7.gz
 %{_mandir}/man1/abrt-retrace-client.1.gz
 %{_datadir}/dbus-1/system-services/com.redhat.abrt.service
 %{_libexecdir}/abrt1-to-abrt2
@@ -411,7 +462,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-gui
 %dir %{_datadir}/%{name}
 # all glade, gtkbuilder and py files for gui
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{vendor}-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/icons/hicolor/*/status/*
 %{_datadir}/%{name}/icons/hicolor/*/status/*
@@ -429,9 +480,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_initrddir}/abrt-ccpp
 %endif
 %{_libexecdir}/abrt-hook-ccpp
+%attr(4755, abrt, abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache
 %{_bindir}/abrt-action-analyze-c
 %{_bindir}/abrt-action-trim-files
-%attr(4755, abrt, abrt) %{_bindir}/abrt-action-install-debuginfo-to-abrt-cache
 %{_bindir}/abrt-action-analyze-core
 %{_bindir}/abrt-action-install-debuginfo
 %{_bindir}/abrt-action-generate-backtrace
@@ -439,14 +490,26 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-action-list-dsos
 %{_sbindir}/abrt-install-ccpp-hook
 %{_sysconfdir}/libreport/events.d/ccpp_event.conf
+%{_sysconfdir}/libreport/events.d/gconf_event.conf
+%{_sysconfdir}/libreport/events.d/vimrc_event.conf
 %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml
-%{_sysconfdir}/libreport/events/analyze_RetraceServer.xml
-%{_sysconfdir}/libreport/events/analyze_xsession_errors.xml
-%{_sysconfdir}/libreport/events/analyze_Smolt.xml
+%{_sysconfdir}/libreport/events/collect_xsession_errors.xml
+%{_sysconfdir}/libreport/events/collect_Smolt.xml
+%{_sysconfdir}/libreport/events/collect_GConf.xml
+%{_sysconfdir}/libreport/events/collect_vimrc_user.xml
+%{_sysconfdir}/libreport/events/collect_vimrc_system.xml
 %{_mandir}/man*/abrt-action-trim-files.*
 %{_mandir}/man*/abrt-action-generate-backtrace.*
 %{_mandir}/man*/abrt-action-analyze-backtrace.*
 %{_mandir}/man*/abrt-action-list-dsos.*
+%{_mandir}/man1/abrt-install-ccpp-hook.1.gz
+%{_mandir}/man1/abrt-action-analyze-c.1.gz
+
+%files retrace-client
+%{_bindir}/abrt-retrace-client
+%{_mandir}/man1/abrt-retrace-client.1.gz
+%{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
+%{_sysconfdir}/libreport/events/analyze_RetraceServer.xml
 
 %files addon-kerneloops
 %defattr(-,root,root,-)
@@ -460,22 +523,41 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-action-analyze-oops
 %{_mandir}/man1/abrt-action-analyze-oops.1*
 
+%files addon-vmcore
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
+%{_sysconfdir}/libreport/events/analyze_VMcore.xml
+%if %{with systemd}
+/lib/systemd/system/abrt-vmcore.service
+%else
+%{_initrddir}/abrt-vmcore
+%endif
+%{_sbindir}/abrt-harvest-vmcore
+%{_bindir}/abrt-action-analyze-vmcore
+
+
 %files addon-python
 %defattr(-,root,root,-)
 #%config(noreplace) %{_sysconfdir}/%{name}/plugins/Python.conf
 %{_sysconfdir}/libreport/events.d/python_event.conf
 %{_bindir}/abrt-action-analyze-python
+%{_mandir}/man1/abrt-action-analyze-python.1*
 %{python_site}/abrt*.py*
 %{python_site}/abrt.pth
 
 %files cli
 %defattr(-,root,root,-)
 %{_bindir}/abrt-cli
+# provide asap
+#% {_mandir}/man1/report-cli.1.gz
 
 %files desktop
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 22 2011 Jiri Moskovcak <jmoskovc@redhat.com> - 2.0.4.980-1
+-
+
 * Tue Sep 13 2011 Jiri Moskovcak <jmoskovc@redhat.com> - 2.0.4-5
 - minor spec file fix