diff --git a/.gitignore b/.gitignore
index 62c9023..bd95e5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /digikam-2.5.0.tar.bz2
 /digikam-2.9.0.tar.bz2
+/digikam-3.0.0-beta1a.tar.bz2
diff --git a/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff b/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
deleted file mode 100644
index de909fd..0000000
--- a/changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e6970f4f2fe48c9f38fb25ca252cc2799d6674d0
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Mon Sep 3 15:17:08 2012 +0200
-
-    use X- prefix with customized kipiplugins group of desktop file
-    BUGS: 306193
-    FIXED-IN: 3.0.0
-
-diff --git a/common/libkipiplugins/kipiplugins.desktop.cmake b/common/libkipiplugins/kipiplugins.desktop.cmake
-index 66c8a2e..c704b92 100644
---- a/common/libkipiplugins/kipiplugins.desktop.cmake
-+++ b/common/libkipiplugins/kipiplugins.desktop.cmake
-@@ -92,5 +92,5 @@ Type=Application
- Exec=""
- Icon=kipi-logo
- 
--[KipiPlugins Entry]
-+[X-KipiPlugins Entry]
- Version=${KIPIPLUGINS_VERSION_STRING}
diff --git a/digikam.spec b/digikam.spec
index df53fb1..91e2607 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,13 +1,13 @@
+%define pre beta1a
 
 Name:	 digikam
-Version: 2.9.0
-Release: 1%{?dist}
+Version: 3.0.0
+Release: 0.1.%{?pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 License: GPLv2+
 URL:	 http://www.digikam.org/
-Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://download.kde.org/unstable/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
 # TODO: upstream me
@@ -22,8 +22,6 @@ Patch0: digikam-2.5.0-clapack-atlas.patch
 ## upstreamable patches
 
 ## upstream patches
-# https://projects.kde.org/projects/extragear/graphics/kipi-plugins/repository/revisions/e6970f4f2fe48c9f38fb25ca252cc2799d6674d0
-Patch100: changeset_re6970f4f2fe48c9f38fb25ca252cc2799d6674d0.diff
 
 # for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
@@ -46,7 +44,7 @@ BuildRequires: pkgconfig(libpgf) >= 6.11.42
 BuildRequires: pkgconfig(libpng) >= 1.2.7
 BuildRequires: pkgconfig(libkdcraw) >= 0.2.0
 BuildRequires: pkgconfig(libkexiv2) >= 1.0.0
-BuildRequires: pkgconfig(libkipi) >= 1.0.0
+BuildRequires: pkgconfig(libkipi) >= 2.0.0
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: mysql-devel mysql-server
 BuildRequires: pkgconfig(exiv2)
@@ -65,6 +63,11 @@ BuildRequires: pkgconfig(qca2)
 ## debianscreenshorts
 BuildRequires: pkgconfig(QJson) 
 
+BuildRequires: pkgconfig(QtGStreamer-0.10)
+BuildRequires: pkgconfig(ImageMagick)
+BuildRequires: herqq-devel
+
+
 # when lib(-devel) subpkgs were split
 Obsoletes: digikam-devel < 2.0.0-2
 
@@ -219,10 +222,6 @@ BuildArch: noarch
 
 %patch0 -p1 -b .clapack-atlas
 
-pushd extra/kipi-plugins/
-%patch100 -p1 -b .kipiplugins_desktop
-popd
-
 
 %build
 
@@ -304,6 +303,10 @@ rm %{buildroot}%{_kde4_libdir}/libdigikamcore.so
 rm %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
 rm %{buildroot}%{_kde4_libdir}/libkipiplugins.so
 rm %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a
+rm %{buildroot}%{_kde4_libdir}/libHUpnp.a
+rm %{buildroot}%{_kde4_libdir}/libHUpnpAv.a
+rm %{buildroot}%{_kde4_libdir}/libQtSoap.a
+rm %{buildroot}%{_kde4_datadir}/locale/*/LC_MESSAGES/libkipi.mo
 
 
 %check
@@ -358,8 +361,8 @@ update-desktop-database -q &> /dev/null
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%{_kde4_libdir}/libdigikamcore.so.2*
-%{_kde4_libdir}/libdigikamdatabase.so.2*
+%{_kde4_libdir}/libdigikamcore.so.3*
+%{_kde4_libdir}/libdigikamdatabase.so.3*
 
 %post -n libkface -p /sbin/ldconfig
 %postun -n libkface -p /sbin/ldconfig
@@ -472,7 +475,11 @@ update-desktop-database -q &> /dev/null
 %{_kde4_libdir}/kde4/kipiplugin_vkontakte.so
 %{_kde4_libdir}/kde4/kipiplugin_yandexfotki.so
 %{_kde4_libdir}/kde4/kipiplugin_wikimedia.so
+%{_kde4_libdir}/kde4/kipiplugin_dlnaexport.so
+%{_kde4_libdir}/kde4/kipiplugin_photivointegration.so
+%{_kde4_libdir}/kde4/kipiplugin_videoslideshow.so
 %{_kde4_appsdir}/kipi/tips
+%{_kde4_appsdir}/kipi/*rc
 %{_kde4_appsdir}/gpssync/
 %{_kde4_appsdir}/kipiplugin_flashexport/
 %{_kde4_appsdir}/kipiplugin_galleryexport/
@@ -481,6 +488,7 @@ update-desktop-database -q &> /dev/null
 %{_kde4_appsdir}/kipiplugin_panorama/
 %{_kde4_appsdir}/kipiplugin_piwigoexport/
 %{_kde4_appsdir}/kipiplugin_printimages/
+%{_kde4_appsdir}/kipiplugin_dlnaexport/
 %{_kde4_datadir}/applications/kde4/dngconverter.desktop
 %{_kde4_datadir}/applications/kde4/kipiplugins.desktop
 %{_kde4_datadir}/applications/kde4/expoblending.desktop
@@ -508,10 +516,13 @@ update-desktop-database -q &> /dev/null
 %postun -n kipi-plugins-libs -p /sbin/ldconfig
 
 %files -n kipi-plugins-libs
-%{_kde4_libdir}/libkipiplugins.so.2*
+%{_kde4_libdir}/libkipiplugins.so.3*
 
 
 %changelog
+* Fri Sep 21 2012 Alexey Kurov <nucleo@fedoraproject.org> - 3.0.0-0.1.beta1a
+- digikam-3.0.0-beta1a
+
 * Sun Sep  2 2012 Alexey Kurov <nucleo@fedoraproject.org> - 2.9.0-1
 - digikam-2.9.0
 
diff --git a/sources b/sources
index 5d2abaf..4112975 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb2971c98cadb31a2d63c4189d26ccab  digikam-2.9.0.tar.bz2
+71bad5e3c7b551a50ee7339321f9dfdc  digikam-3.0.0-beta1a.tar.bz2