diff --git a/.gitignore b/.gitignore
index da29573..97cd520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-libassuan-1.0.5.tar.bz2
-libassuan-1.0.5.tar.bz2.sig
+libassuan-2.0.0.tar.bz2
+libassuan-2.0.0.tar.bz2.sig
diff --git a/libassuan.spec b/libassuan.spec
index 28c7224..14070ad 100644
--- a/libassuan.spec
+++ b/libassuan.spec
@@ -1,8 +1,7 @@
-
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 1.0.5
-Release: 4%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
 
 # The library is LGPLv2+, the documentation GPLv3+
 License: LGPLv2+ and GPLv3+
@@ -14,10 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  libassuan-1.0.5-multilib.patch
 
-# -debuginfo useless for (only) static libs
-%define debug_package   %{nil}
-
 BuildRequires: gawk
+BuildRequires: libgpg-error-devel
 BuildRequires: pth-devel
 
 %description
@@ -30,8 +27,6 @@ Group: Development/Libraries
 Requires: pth-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Obsoletes: libassuan-static < 1.0.3 
-Provides:  libassuan-static = %{version}-%{release}
 %description devel 
 This is the IPC static library used by GnuPG 2, GPGME and a few other
 packages.
@@ -46,10 +41,8 @@ This package contains files needed to develop applications using %{name}.
 
 
 %build
-#ifarch x86_64
-export CFLAGS="%{optflags} -fPIC"
-#endif
-%configure
+%configure \
+  --includedir=%{_includedir}/libassuan2
 
 make %{?_smp_mflags}
 
@@ -61,6 +54,7 @@ make install DESTDIR=%{buildroot}
 
 ## Unpackaged files
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %check
@@ -79,18 +73,24 @@ fi
 %clean
 rm -rf %{buildroot}
 
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README THANKS TODO
+%{_libdir}/libassuan.so.0*
 
 %files devel 
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README THANKS TODO
 %{_bindir}/libassuan-config
-%{_includedir}/*
-%{_libdir}/lib*.a
-%{_datadir}/aclocal/*
+%{_includedir}/libassuan2/
+%{_libdir}/libassuan.so
+%{_datadir}/aclocal/libassuan.m4
 %{_infodir}/assuan.info*
 
 
 %changelog
+* Tue Jul 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 2.0.0-1
+- libassuan-2.0.0 (#573796)
+
 * Thu Dec 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-4
 - better versioning for Obsoletes
 - better (upstreamable) multilib patch
diff --git a/sources b/sources
index 909269b..0b14875 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c2db0974fcce4401f48f3fa41c4edc5a  libassuan-1.0.5.tar.bz2
-167c1838f56f3b85083422668b369f17  libassuan-1.0.5.tar.bz2.sig
+59bc0ae7194c412d7a522029005684b2  libassuan-2.0.0.tar.bz2
+bb73e093d65d5b165d20b7377fee72a5  libassuan-2.0.0.tar.bz2.sig