diff --git a/ChangeLog b/ChangeLog
index f858c0a67ef40793caa45c655fe7c156965a273c..62717c7caabe494a8bde22d6e91fe08c88ef2477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-09-19  Niels M�ller  <niels@s3.kth.se>
+
+	* examples/rsa-decrypt.c: Fixes to get the file to compile. It
+	won't work yet.
+
+	* examples/Makefile.am (EXTRA_PROGRAMS): Added rsa-encrypt and
+	rsa-decrypt.
+
+	* examples/io.c (write_file): New function.
+	(write_string): Simplified error check, it's no real point in
+	calling ferror unless we also call fflush.
+
+	* examples/rsa-keygen.c (main): Check return value from
+	simple_random. 
+
+	* examples/rsa-decrypt.c, examples/rsa-encrypt.c,
+	examples/rsa-session.h: New files, demonstrating rsa encryption
+	and decryption.
+
+	* configure.ac (RSA_EXAMPLES): Added rsa-encrypt and rsa-decrypt.
+
 2003-09-01  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* testsuite/testutils.c (print_hex): Use const.
diff --git a/examples/.cvsignore b/examples/.cvsignore
index 41eb6aeb20fd27000b23b9a272341b6a42c50e8d..41ff38b4783de5358e0d43da35d2852e1472ef10 100644
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -2,6 +2,8 @@
 Makefile
 Makefile.in
 nettle-benchmark
+rsa-decrypt
+rsa-encrypt
 rsa-keygen
 rsa-sign
 rsa-verify
diff --git a/examples/.gitignore b/examples/.gitignore
index d0579e5dbb8f52c6ce3e1d8191b2c9b7c7f68e78..133bc9241ba1a6c11f2b9ff23a43662c77393297 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -2,6 +2,8 @@
 /Makefile
 /Makefile.in
 /nettle-benchmark
+/rsa-decrypt
+/rsa-encrypt
 /rsa-keygen
 /rsa-sign
 /rsa-verify