diff --git a/Makefile.am b/Makefile.am
index 07184eb19877bab11823e91b1f906ec6a0046a51..20ee1897e3ceebc9a161ce91830592d39b37a164 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,18 +9,21 @@ libnettleinclude_HEADERS = aes.h arcfour.h blowfish.h cast128.h \
 			   cbc.h \
 			   des.h des-compat.h \
 			   hmac.h \
+			   knuth-lfib.h \
 			   md5.h md5-compat.h \
 			   nettle-meta.h rsa.h \
 			   serpent.h sha.h twofish.h \
 			   yarrow.h
 			   
-libnettle_a_SOURCES = aes.c aes.h aes-meta.c arcfour.c arcfour.h arcfour-meta.c\
+libnettle_a_SOURCES = aes.c aes.h aes-meta.c \
+		      arcfour.c arcfour.h arcfour-meta.c\
 		      cast128.c cast128.h cast128_sboxes.h cast128-meta.c \
 		      blowfish.h blowfish.c \
 		      cbc.c \
 		      des.c des.h desinfo.h desCode.h \
 		      des3.c des-compat.c des-compat.h \
 		      hmac.c hmac-md5.c hmac-sha1.c \
+		      knuth-lfib.c \
 		      md5.c md5.h md5-compat.c md5-compat.h md5-meta.c \
 		      sha.h sha1.c sha1-meta.c sha256.c sha256-meta.c \
 		      serpent.c serpent.h serpent_sboxes.h serpent-meta.c \
@@ -28,7 +31,7 @@ libnettle_a_SOURCES = aes.c aes.h aes-meta.c arcfour.c arcfour.h arcfour-meta.c\
 		      yarrow.h yarrow256.c yarrow_key_event.c \
 		      bignum.h bignum.c \
 		      rsa.h rsa.c rsa_md5.c rsa_sha1.c \
-		      rsa-compat.h rsa-compat.c \
+		      rsa-keygen.c rsa-compat.h rsa-compat.c \
 		      nettle-internal.c nettle-internal.h
 
 libnettle_a_LIBADD = @LIBOBJS@
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index e5ea43f0abda67b56bf95cd90653ee99eef89b3b..1df29ed23278090a687e3fdd77cc8d980578f5c6 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -11,8 +11,10 @@ des-compat-test
 des-test
 des3-test
 hmac-test
+knuth-lfib-test
 md5-compat-test
 md5-test
+rsa-keygen-test
 rsa-test
 serpent-test
 sha1-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index caf040e089acfab54ddff83dfc58d5dcce61e024..9b82844b7d6c5ed28d733842e61ba93e1d64ccb6 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -11,8 +11,10 @@
 /des-test
 /des3-test
 /hmac-test
+/knuth-lfib-test
 /md5-compat-test
 /md5-test
+/rsa-keygen-test
 /rsa-test
 /serpent-test
 /sha1-test
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 555ca14a80e837b62c17b762a479c05c08ab971b..e742702aabb562659809a705c2631535ea728b58 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -5,7 +5,9 @@ TS_PROGS = aes-test arcfour-test blowfish-test cast128-test \
 	   des-test des3-test des-compat-test \
 	   md5-test md5-compat-test sha1-test sha256-test \
 	   serpent-test twofish-test \
-	   cbc-test hmac-test rsa-test bignum-test yarrow-test
+	   knuth-lfib-test \
+	   cbc-test hmac-test bignum-test \
+	   rsa-test rsa-keygen-test yarrow-test
 
 noinst_PROGRAMS = $(TS_PROGS)