diff --git a/.gitignore b/.gitignore
index ed4aeea..702d4f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 cryptopp-5.6.1.svn479.tar.bz2
+/cryptopp561.zip
diff --git a/cryptopp.pc b/cryptopp.pc
index ba58805..81228b6 100644
--- a/cryptopp.pc
+++ b/cryptopp.pc
@@ -1,12 +1,14 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib 
-includedir=${prefix}/include 
+prefix=@PREFIX@
+exec_prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
 
 Name: Crypto++
-Description: General purpose cryptographic shared library
-URL: http://www.cryptopp.com
+Description: A free C++ class library of cryptographic schemes
 Version: 5.6.1
+URL: http://www.cryptopp.com
 Requires:
-Libs: -lcryptopp
-Cflags:
+Conflicts:
+Libs: -L${libdir} -lcryptopp
+Libs.private:
+Cflags: -I${includedir}/cryptopp/
diff --git a/cryptopp.spec b/cryptopp.spec
index 7ef1aae..142d84d 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,17 +1,11 @@
 Name:           cryptopp
 Version:        5.6.1
-Release:        0.1.svn479%{?dist}
+Release:        1%{?dist}
 Summary:        Public domain C++ class library of cryptographic schemes
 License:        Public Domain
 Group:          System Environment/Libraries
 URL:            http://www.cryptopp.com/
-#Source0:        http://www.cryptopp.com/cryptopp560.zip
-
-# The source for this package was pulled from upstream's vcs.
-# Use the following commands to generate the tarball:
-#  svn export -r 479 https://cryptopp.svn.sourceforge.net/svnroot/cryptopp/trunk/c5 cryptopp
-#  tar -cjf cryptopp-5.6.1.svn479.tar.bz2 cryptopp
-Source0:        cryptopp-5.6.1.svn479.tar.bz2
+Source0:        http://www.cryptopp.com/cryptopp561.zip
 Source1:        cryptopp.pc
 Patch0:         cryptopp-5.6.1-autotools.patch
 Patch1:         cryptopp-5.6.1-s390.patch
@@ -41,6 +35,7 @@ for %{name}.
 %package doc
 Summary:        Documentation for %{name}
 Group:          Documentation
+BuildArch:      noarch
 
 %description doc
 Crypto++ Library is a free C++ class library of cryptographic schemes.
@@ -58,10 +53,7 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
 This package contains programs for manipulating %{name} routines.
 
 %prep
-
-cp %{SOURCE1} .
-
-%setup -q -n %{name}
+%setup -q -c
 rm -f GNUmakefile
 %patch0 -p1
 %patch1 -p1 -b .s390
@@ -81,10 +73,16 @@ doxygen
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/cryptopp.pc
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c "
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+# Install the pkg-config file
+install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
+# Fill in the variables
+sed -i "s|@PREFIX@|%{_prefix}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
+sed -i "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
+sed -i "s|@INCLUDEDIR@|%{_includedir}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
+
 %check
 ./cryptest v 2>&1 | tee cryptest.log
 grep -qs '^FAILED' cryptest.log && exit 1 || :
@@ -100,13 +98,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 %doc License.txt Readme.txt
 %defattr(-,root,root,0755)
-%{_libdir}/*.so.*
+%{_libdir}/libcryptopp.so.6*
 
 %files devel
 %defattr(0644,root,root,0755)
 %{_includedir}/cryptopp
 %defattr(-,root,root,0755)
-%{_libdir}/*.so
+%{_libdir}/libcryptopp.so
 %{_libdir}/pkgconfig/cryptopp.pc
 
 %files doc
@@ -119,6 +117,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep  1 2010 Alexey Kurov <nucleo@fedoraproject.org> - 5.6.1-1
+- Crypto++ 5.6.1
+- fixed pkgconfig file installation
+- build cryptopp-doc as noarch subpkg
+
 * Thu Nov 26 2009 Alexey Kurov <nucleo@fedoraproject.org> - 5.6.1-0.1.svn479
 - svn r479. MARS placed in the public domain by Wei Dai
 - Fixes rhbz#539227
diff --git a/sources b/sources
index 2b5e9cb..f060461 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-caedd2488d642f839a1d5169a28b0d01  cryptopp-5.6.1.svn479.tar.bz2
+96cbeba0907562b077e26bcffb483828  cryptopp561.zip