diff --git a/keygen/Makefile b/keygen/Makefile
new file mode 100755
index 00000000..e16dff6c
--- /dev/null
+++ b/keygen/Makefile
@@ -0,0 +1,22 @@
+# libvnc makefile
+
+KEYGENOBJ = keygen.o os_calls.o
+
+DEFINES =
+
+CFLAGS = -Wall -O2 -I../common $(DEFINES)
+C_OS_FLAGS = $(CFLAGS) -c
+LDFLAGS =
+LIBS = -ldl -lcrypto
+CC = gcc
+
+all: keygen_
+
+keygen_: $(KEYGENOBJ)
+	$(CC) $(LDFLAGS) -o keygen $(KEYGENOBJ) $(LIBS)
+
+clean:
+	rm -f $(KEYGENOBJ) keygen
+
+os_calls.o: ../common/os_calls.c
+	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
diff --git a/keygen/keygen.c b/keygen/keygen.c
new file mode 100755
index 00000000..c3dd99fd
--- /dev/null
+++ b/keygen/keygen.c
@@ -0,0 +1,135 @@
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   xrdp: A Remote Desktop Protocol server.
+   Copyright (C) Jay Sorg 2007
+
+   rsa key generator for xrdp
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <openssl/rc4.h>
+#include <openssl/md5.h>
+#include <openssl/sha.h>
+#include <openssl/bn.h>
+#include <openssl/x509v3.h>
+#include <openssl/rsa.h>
+#include "os_calls.h"
+#include "arch.h"
+
+#define MY_KEY_SIZE 512
+
+static char g_rev_exponent[4] = { 0x00, 0x01, 0x00, 0x01 };
+
+/*****************************************************************************/
+static int APP_CC
+out_params(void)
+{
+  g_writeln("");
+  g_writeln("key gen utility example './keygen xrdp'");
+  g_writeln("");
+  return 0;
+}
+
+/*****************************************************************************/
+static int APP_CC
+key_gen(void)
+{
+  char* e_data;
+  char* n_data;
+  char* d_data;
+  int e_len;
+  int n_len;
+  int d_len;
+  int error;
+  BN_CTX* my_ctx;
+  RSA* my_key;
+  BIGNUM* my_e;
+
+  e_data = 0;
+  n_data = 0;
+  d_data = 0;
+  error = 0;
+  my_ctx = BN_CTX_new();
+  my_e = BN_new();
+  BN_bin2bn((unsigned char*)g_rev_exponent, sizeof(g_rev_exponent), my_e);
+  my_key = RSA_new();
+  g_writeln("");
+  g_writeln("Generating %d bit rsa key...", MY_KEY_SIZE);
+  g_writeln("");
+  /* RSA_generate_key_ex returns boolean */
+  error = RSA_generate_key_ex(my_key, MY_KEY_SIZE, my_e, 0) == 0;
+  if (error == 0)
+  {
+    g_writeln("RSA_generate_key_ex ok");
+    g_writeln("");
+    e_len = BN_num_bytes(my_key->e);
+    if (e_len > 0)
+    {
+      e_data = (char*)g_malloc(e_len, 0);
+      BN_bn2bin(my_key->e, (unsigned char*)e_data);
+      g_writeln("public exponent size %d bytes", e_len);
+      g_hexdump(e_data, e_len);
+      g_writeln("");
+    }
+    n_len = BN_num_bytes(my_key->n);
+    if (n_len > 0)
+    {
+      n_data = (char*)g_malloc(n_len, 0);
+      BN_bn2bin(my_key->n, (unsigned char*)n_data);
+      g_writeln("public modulus size %d bytes", n_len);
+      g_hexdump(n_data, n_len);
+      g_writeln("");
+    }
+    d_len = BN_num_bytes(my_key->d);
+    if (d_len > 0)
+    {
+      d_data = (char*)g_malloc(d_len, 0);
+      BN_bn2bin(my_key->d, (unsigned char*)d_data);
+      g_writeln("private exponent size %d bytes", d_len);
+      g_hexdump(d_data, d_len);
+      g_writeln("");
+    }
+  }
+  else
+  {
+    g_writeln("error %d in key_gen, RSA_generate_key_ex", error);
+  }
+  BN_free(my_e);
+  RSA_free(my_key);
+  BN_CTX_free(my_ctx);
+  g_free(e_data);
+  g_free(n_data);
+  g_free(d_data);
+  return error;
+}
+
+/*****************************************************************************/
+int DEFAULT_CC
+main(int argc, char** argv)
+{
+  if (argc == 2)
+  {
+    if (g_strcasecmp(argv[1], "xrdp") == 0)
+    {
+      return key_gen();
+    }
+  }
+  out_params();
+  return 0;
+}