diff --git a/configure.in b/configure.in
index 535a06414..d6a568b5d 100644
--- a/configure.in
+++ b/configure.in
@@ -219,6 +219,18 @@ AC_ARG_ENABLE(
 )
 AM_CONDITIONAL(USE_VENDORID, test x$vendor_id = xtrue)
 
+AC_ARG_ENABLE(
+    [uml],
+    AS_HELP_STRING([--enable-uml],[build the UML test framework (default is NO).]),
+    [if test x$enableval = xyes; then
+        uml=true
+     else
+        uml=false
+    fi],
+    uml=true
+)
+AM_CONDITIONAL(USE_UML, test x$uml = xtrue)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
diff --git a/src/Makefile.am b/src/Makefile.am
index 204a211e4..51c24d856 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = include libfreeswan libcrypto libstrongswan pluto whack charon stroke starter openac scepclient ipsec _updown _updown_espmark _copyright 
+SUBDIRS = include libfreeswan libcrypto libstrongswan pluto whack charon stroke starter openac scepclient ipsec _updown _updown_espmark _copyright dumm
+
+if USE_UML
+  SUBDIRS += dumm
+endif
+