diff --git a/Makefile.am b/Makefile.am
index 2135bb3a..c401c690 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,4 +7,5 @@ SUBDIRS = \
   mc \
   libxrdp \
   xrdp \
-  sesman
+  sesman \
+  keygen
diff --git a/configure.ac b/configure.ac
index c334ec7f..1fbbc5d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,11 +29,11 @@ AC_CONFIG_FILES([Makefile
                  xrdp/Makefile
                  sesman/Makefile
                  sesman/libscp/Makefile
+                 keygen/Makefile
 ])
 #                 docs/Makefile
 #                 docs/man/Makefile
 #                 fontdump/Makefile
-#                 keygen/Makefile
 #                 sesman/tools/Makefile
 #                 xrdp/cursors/Makefile
 #                 Xserver/hw/rdp/Makefile