diff --git a/Makefile.am b/Makefile.am
index 54ffb1227bd48f8a2836d8db85e602108b1d8799..ff0f4cfb3409506c6f1d5fd5013ff1243bf1e9bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ libnettleincludedir = $(includedir)/nettle
 
 lib_LIBRARIES = libnettle.a
 libnettleinclude_HEADERS = aes.h arcfour.h blowfish.h \
-			   base64.h cast128.h \
+			   base64.h buffer.h cast128.h \
 			   cbc.h \
 			   des.h des-compat.h \
 			   hmac.h \
@@ -35,11 +35,13 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \
 		      serpent.c serpent.h serpent_sboxes.h serpent-meta.c \
 		      twofish.c twofish.h twofish-meta.c \
 		      yarrow.h yarrow256.c yarrow_key_event.c \
-		      sexp.h sexp.c \
+		      sexp.h sexp.c sexp_format.c \
 		      bignum.h bignum.c \
 		      rsa.h rsa.c rsa_md5.c rsa_sha1.c \
 		      rsa-encrypt.c rsa-decrypt.c \
 		      rsa-keygen.c rsa-compat.h rsa-compat.c \
+		      rsa2sexp.c sexp2rsa.c \
+		      buffer.h buffer.c \
 		      nettle-meta.h \
 		      nettle-internal.c nettle-internal.h nettle-openssl.c