diff --git a/epiphany.spec b/epiphany.spec
index 6382af4..deea876 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -8,7 +8,9 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.24.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
+%define major_version 2.24
+Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -179,6 +181,11 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/icons/HighContrastLargePrintInverse/icon-theme
 # LowContrastLargePrint seems to be obsolete, so remove it until further notice
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/icons/LowContrastLargePrint
 
+# directories for plugins and extensions
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/epiphany/%{version}/{plugins,extensions}
+ln -sf %{version}/plugins $RPM_BUILD_ROOT%{_libdir}/epiphany/plugins
+ln -sf %{version}/extensions $RPM_BUILD_ROOT%{_libdir}/epiphany/extensions
+
 %post
 update-desktop-database -q %{_datadir}/applications
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -231,8 +238,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
 %{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
-%{_bindir}/epiphany
 %{_libdir}/epiphany
+%{_bindir}/epiphany
 %{_datadir}/applications/*.desktop
 %{_datadir}/epiphany
 %{_mandir}/man*/*
@@ -242,6 +249,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
 %{_datadir}/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
 %{_datadir}/dbus-1/services/org.gnome.Epiphany.service
+#%{_libdir}/epiphany/plugins
+#%{_libdir}/epiphany/extensions
+#%{_libdir}/epiphany/%{version}
+#%{_libdir}/epiphany/%{version}/plugins
+#%{_libdir}/epiphany/%{version}/extensions
 
 %files devel
 %defattr(-, root, root)
@@ -252,6 +264,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Wed Jan 14 2009 Matěj Cepl <mcepl@redhat.com> 2.24.2.1-2
+- Make epiphany own directories for plugins and extensions
+  (#479921).
+
 * Mon Jan  5 2009 Christopher Aillon <caillon@redhat.com> - 2.24.2.1-1
 - Update to 2.24.2.1