diff --git a/CHANGES b/CHANGES
index 4a28fc9205106c0707a3c27d90cf1c19c1b745ff..41a087f28dbd45b2969f58b551837cf811a5df08 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.7e and 0.9.8  [xx XXX xxxx]
 
+  *) Deprecate BN_[get|set]_params() functions (they were ignored internally).
+     [Geoff Thorpe]
+
   *) New FIPS 180-2 algorithms, SHA-224/-256/-384/-512 are implemented.
      [Andy Polyakov and a number of other people]
 
diff --git a/TABLE b/TABLE
index 3e2319bc34deac4c609a3eadb46f61c0249103d8..a3f2fd89e5889cd279bd95589584239cf6470ee9 100644
--- a/TABLE
+++ b/TABLE
@@ -1652,7 +1652,7 @@ $arflags      =
 
 *** debug-geoff
 $cc           = gcc
-$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DBN_CTX_DEBUG -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -g -ggdb3 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
+$cflags       = -DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 0f6373aea9d33e69c21921768dda9940c3203799..3477a13fffafdedd4bbfe7fb053181d0cd4a5fb0 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -539,8 +539,10 @@ int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx);
 int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *r, BN_CTX *ctx);
 int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
 
+#ifndef OPENSSL_NO_DEPRECATED
 void BN_set_params(int mul,int high,int low,int mont);
 int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
+#endif
 
 void	BN_RECP_CTX_init(BN_RECP_CTX *recp);
 BN_RECP_CTX *BN_RECP_CTX_new(void);
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index bbc359cb7859eb88bd9161c7dfbb44304e902fc4..789e9aa4fb6c59c81720d662439f2cfc916efbac 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -69,6 +69,8 @@
 
 const char *BN_version="Big Number" OPENSSL_VERSION_PTEXT;
 
+/* This stuff appears to be completely unused, so is deprecated */
+#ifndef OPENSSL_NO_DEPRECATED
 /* For a 32 bit machine
  * 2 -   4 ==  128
  * 3 -   8 ==  256
@@ -127,6 +129,7 @@ int BN_get_params(int which)
 	else if (which == 3) return(bn_limit_bits_mont);
 	else return(0);
 	}
+#endif
 
 const BIGNUM *BN_value_one(void)
 	{
diff --git a/util/libeay.num b/util/libeay.num
index b6dab240034f1b73df5c3f9708df79eca67d8239..3f70cd95867895505cd9f0e5fcc9381253052df4 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1221,8 +1221,8 @@ BIO_f_reliable                          1244	EXIST::FUNCTION:BIO
 PKCS7_dataFinal                         1245	EXIST::FUNCTION:
 PKCS7_dataDecode                        1246	EXIST::FUNCTION:
 X509V3_EXT_CRL_add_conf                 1247	EXIST::FUNCTION:
-BN_set_params                           1248	EXIST::FUNCTION:
-BN_get_params                           1249	EXIST::FUNCTION:
+BN_set_params                           1248	EXIST::FUNCTION:DEPRECATED
+BN_get_params                           1249	EXIST::FUNCTION:DEPRECATED
 BIO_get_ex_num                          1250	NOEXIST::FUNCTION:
 BIO_set_ex_free_func                    1251	NOEXIST::FUNCTION:
 EVP_ripemd160                           1252	EXIST::FUNCTION:RIPEMD
@@ -3227,3 +3227,7 @@ SHA384_Init                             3629	EXIST::FUNCTION:SHA,SHA512
 SHA384_Final                            3630	EXIST::FUNCTION:SHA,SHA512
 SHA384                                  3631	EXIST::FUNCTION:SHA,SHA512
 SHA256_Update                           3632	EXIST::FUNCTION:SHA,SHA256
+EVP_sha384                              3633	EXIST::FUNCTION:SHA,SHA512
+EVP_sha512                              3634	EXIST::FUNCTION:SHA,SHA512
+EVP_sha224                              3635	EXIST::FUNCTION:SHA,SHA256
+EVP_sha256                              3636	EXIST::FUNCTION:SHA,SHA256