diff --git a/ChangeLog b/ChangeLog
index 6e2c063c8..26b6b1d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ PolarSSL ChangeLog
 Features
    * Added support for PKCS#1 v2.1 encoding and thus support
      for the RSAES-OAEP and RSASSA-PSS operations.
+   * Reading of Public Key files incorporated into default x509
+     functionality as well.
 
 Changes
    * Debug print of MPI now removes leading zero octets and 
@@ -15,6 +17,8 @@ Bugfix
 	 Kiilerich and Mihai Militaru)
    * Fixed bug in ssl_write() when flushing old data (Fixed ticket
      #18, found by Nikolay Epifanov)
+   * Fixed proper handling of RSASSA-PSS verification with variable
+     length salt lengths
 
 = Version 0.99-pre3 released on 2011-02-28
 This release replaces version 0.99-pre2 which had possible copyright issues.
diff --git a/programs/Makefile b/programs/Makefile
index 6cc13892b..6f5da81cb 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -14,6 +14,7 @@ APPS =	aes/aescrypt2	aes/crypt_and_hash	\
 	pkey/dh_genprime	pkey/dh_server		\
 	pkey/mpi_demo		pkey/rsa_genkey		\
 	pkey/rsa_sign		pkey/rsa_verify		\
+	pkey/rsa_sign_pss	pkey/rsa_verify_pss \
 	ssl/ssl_client1		ssl/ssl_client2		\
 	ssl/ssl_server		random/gen_random	\
 	test/ssl_cert_test	test/benchmark		\
@@ -80,7 +81,15 @@ pkey/rsa_verify: pkey/rsa_verify.c ../library/libpolarssl.a
 	echo   "  CC    pkey/rsa_verify.c"
 	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_verify.c  $(LDFLAGS) -o $@
 
-random/gen_random: random/gen_random.c ../library/libpolarssl.a
+pkey/rsa_sign_pss: pkey/rsa_sign_pss.c ../library/libpolarssl.a
+	echo   "  CC    pkey/rsa_sign_pss.c"
+	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_sign_pss.c    $(LDFLAGS) -o $@
+
+pkey/rsa_verify_pss: pkey/rsa_verify_pss.c ../library/libpolarssl.a
+	echo   "  CC    pkey/rsa_verify_pss.c"
+	$(CC) $(CFLAGS) $(OFLAGS) pkey/rsa_verify_pss.c  $(LDFLAGS) -o $@
+
+Random/gen_random: random/gen_random.c ../library/libpolarssl.a
 	echo   "  CC    random/gen_random.c"
 	$(CC) $(CFLAGS) $(OFLAGS) random/gen_random.c $(LDFLAGS) -o $@