diff --git a/ChangeLog b/ChangeLog
index 8d6b3528f..17b458515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 31 12:59:18 CET 2008 (tk)
+---------------------------------
+  * libclamav, freshclam, sigtool: s/HAVE_GMP/HAVE_LIBGMP
+
 Thu Jan 31 13:48:24 EET 2008 (edwin)
 ------------------------------------
  * build system:
diff --git a/freshclam/manager.c b/freshclam/manager.c
index fd5fbe214..f56e5ab0a 100644
--- a/freshclam/manager.c
+++ b/freshclam/manager.c
@@ -1183,7 +1183,7 @@ int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, c
     time(&currtime);
     logg("ClamAV update process started at %s", ctime(&currtime));
 
-#ifndef HAVE_GMP
+#ifndef HAVE_LIBGMP
     logg("SECURITY WARNING: NO SUPPORT FOR DIGITAL SIGNATURES\n");
     logg("See the FAQ at http://www.clamav.net/support/faq for an explanation.\n");
 #endif
diff --git a/libclamav/cvd.c b/libclamav/cvd.c
index ccbd8f36f..416988c84 100644
--- a/libclamav/cvd.c
+++ b/libclamav/cvd.c
@@ -434,7 +434,7 @@ static int cli_cvdverify(FILE *fs, struct cl_cvd *cvdpt, unsigned int cld)
 	return CL_EMD5;
     }
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
     if(cli_versig(md5, cvd->dsig)) {
 	cli_dbgmsg("cli_cvdverify: Digital signature verification error\n");
 	free(md5);
diff --git a/libclamav/dsig.c b/libclamav/dsig.c
index 215598d6b..c35c96c71 100644
--- a/libclamav/dsig.c
+++ b/libclamav/dsig.c
@@ -22,7 +22,7 @@
 #include "clamav-config.h"
 #endif
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 
 #include <stdio.h>
 #include <string.h>
diff --git a/libclamav/dsig.h b/libclamav/dsig.h
index 3ddf65c55..4be4c3923 100644
--- a/libclamav/dsig.h
+++ b/libclamav/dsig.h
@@ -23,11 +23,11 @@
 #include "clamav-config.h"
 #endif
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 #include <gmp.h>
 
 int cli_versig(const char *md5, const char *dsig);
 unsigned char *cli_decodesig(const char *sig, unsigned int plen, mpz_t e, mpz_t n);
 
-#endif /* HAVE_GMP */
+#endif /* HAVE_LIBGMP */
 #endif
diff --git a/shared/cdiff.c b/shared/cdiff.c
index 909ea9fa5..aef3d4ea0 100644
--- a/shared/cdiff.c
+++ b/shared/cdiff.c
@@ -43,14 +43,14 @@
 
 #include "zlib.h"
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 #include "libclamav/dsig.h"
 
 #define PSS_NSTR "14783905874077467090262228516557917570254599638376203532031989214105552847269687489771975792123442185817287694951949800908791527542017115600501303394778618535864845235700041590056318230102449612217458549016089313306591388590790796515819654102320725712300822356348724011232654837503241736177907784198700834440681124727060540035754699658105895050096576226753008596881698828185652424901921668758326578462003247906470982092298106789657211905488986281078346361469524484829559560886227198091995498440676639639830463593211386055065360288422394053998134458623712540683294034953818412458362198117811990006021989844180721010947"
 #define PSS_ESTR "100002053"
 #define PSS_NBITS 2048
 #define PSS_DIGEST_LENGTH 32
-#endif /* HAVE_GMP */
+#endif /* HAVE_LIBGMP */
 
 struct cdiff_node {
     unsigned int lineno;
@@ -766,7 +766,7 @@ static int cdiff_execute(const char *cmdstr, struct cdiff_ctx *ctx)
     return 0;
 }
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 static void pss_mgf(unsigned char *in, unsigned int inlen, unsigned char *out, unsigned int outlen)
 {
 	SHA256_CTX ctx;
@@ -864,7 +864,7 @@ static int pss_versig(const unsigned char *sha256, const char *dsig)
 
     return 0;
 }
-#endif /* HAVE_GMP */
+#endif /* HAVE_LIBGMP */
 
 int cdiff_apply(int fd, unsigned short mode)
 {
@@ -877,7 +877,7 @@ int cdiff_apply(int fd, unsigned short mode)
 	int end, i, n;
 	struct stat sb;
 	int desc;
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 	SHA256_CTX sha256ctx;
 	unsigned char digest[32];
 	int sum, bread;
@@ -938,7 +938,7 @@ int cdiff_apply(int fd, unsigned short mode)
 	    return -1;
 	}
 
-#ifdef HAVE_GMP
+#ifdef HAVE_LIBGMP
 	sha256_init(&sha256ctx);
 	sum = 0;
 	while((bread = read(desc, buff, FILEBUFF)) > 0) {
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 3f9c256fa..3c792031d 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1009,7 +1009,7 @@ static int cvdinfo(struct optstruct *opt)
     mprintf("MD5: %s\n", cvd->md5);
     mprintf("Digital signature: %s\n", cvd->dsig);
 
-#ifndef HAVE_GMP
+#ifndef HAVE_LIBGMP
     mprintf("^Digital signature support not compiled in.\n");
 #endif