diff --git a/ChangeLog b/ChangeLog
index 2a61f7022863e0b08eafc6e3ad22838c47cefec8..2a4e2c5237e5648f4435a3289f850a6e2ef61130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-21  Niels M�ller  <nisse@lysator.liu.se>
+
+	* dsa-keygen.c (dsa_generate_keypair): Avoid double init of mpz
+	variable. Spotted by Nikos Mavrogiannopoulos.
+
 2011-05-06  Niels M�ller  <nisse@lysator.liu.se>
 
 	* configure.ac: Fix link flags for shared libraries on Solaris,
diff --git a/dsa-keygen.c b/dsa-keygen.c
index be1777123eba349e48a392401904e54ebcd7734d..00bd35f6a60a47c5155a95b940688b981861ab7d 100644
--- a/dsa-keygen.c
+++ b/dsa-keygen.c
@@ -106,7 +106,7 @@ dsa_generate_keypair(struct dsa_public_key *pub,
   if (progress)
     progress (progress_ctx, 'g');
 
-  mpz_init_set(r, pub->q);
+  mpz_set(r, pub->q);
   mpz_sub_ui(r, r, 2);
   nettle_mpz_random(key->x, random_ctx, random, r);