diff --git a/cryptopp.pc b/cryptopp.pc
index 79478e2..e333f6f 100644
--- a/cryptopp.pc
+++ b/cryptopp.pc
@@ -5,8 +5,8 @@ includedir=@INCLUDEDIR@
 
 Name: Crypto++
 Description: A free C++ class library of cryptographic schemes
-Version: 5.6.2
-URL: http://www.cryptopp.com
+Version: @VERSION@
+URL: https://www.cryptopp.com
 Requires:
 Conflicts:
 Libs: -L${libdir} -lcryptopp
diff --git a/cryptopp.spec b/cryptopp.spec
index 73cd7be..7832991 100644
--- a/cryptopp.spec
+++ b/cryptopp.spec
@@ -1,4 +1,4 @@
-%define major 6
+%define major 5.6
 %define libname %mklibname %{name} %{major}
 %define devname %mklibname %{name} -d
 %define staticname %mklibname %{name} -s -d
@@ -160,7 +160,7 @@ Crypto++ Library is a free C++ class library of cryptographic schemes.
 This package contains programs for manipulating %{name} routines.
 
 %files progs
-%{_bindir}/cryptest
+%{_bindir}/cryptest*
 %{_datadir}/%{name}
 
 #----------------------------------------------------------------------------
@@ -179,18 +179,18 @@ find . -type f -exec chmod a+r {} \;
 export CXXFLAGS="%{optflags} -DNDEBUG"
 #configure2_5x \
 #	--enable-static
-%make
+%make static dynamic cryptest.exe
 doxygen
 
 %install
-%makeinstall_std
+%makeinstall_std PREFIX=%{_prefix} LIBDIR=%{_libdir}
 
 sed -i -e 's/\r$//g' License.txt Readme.txt
 
 # Install pkg-config file
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
 # Set variables
-sed -i "s|@PREFIX@|%{_prefix}|g;s|@LIBDIR@|%{_libdir}|g;s|@INCLUDEDIR@|%{_includedir}|g" %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
+sed -i "s|@PREFIX@|%{_prefix}|g;s|@LIBDIR@|%{_libdir}|g;s|@INCLUDEDIR@|%{_includedir}|g;s|@VERSION@|%{version}|g" %{buildroot}%{_libdir}/pkgconfig/cryptopp.pc
 
 install -d %{buildroot}%{_datadir}/%{name}/TestVectors
 install -m 0644 TestVectors/* %{buildroot}%{_datadir}/%{name}/TestVectors
@@ -199,6 +199,11 @@ install -m 0644 TestData/* %{buildroot}%{_datadir}/%{name}/TestData
 
 rm -f %{buildroot}%{_bindir}/cryptestcwd
 
+pushd %{buildroot}%{_bindir}
+ln -sf cryptest.exe cryptest
+popd
+
+
 %check
 #./cryptestcwd v
 ./cryptest.sh