diff --git a/ChangeLog b/ChangeLog
index 3d1c313..0605ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -318,13 +318,20 @@ Version 1.8.0
 Version 1.6.16
 *******************************************************************************
 
-2012-03-08 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	Adding configure options
+
+	Adding --disable-ssdp, --disable-soap, --disable-gena options to
+	configure script.
+
+2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Bug fix of last commit
 
 	_snprintf was wrongly defined in ssdp_server.c
 
-2012-03-08 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	SF Bug Tracker id 3499781 - msvc doesn't have snprintf
 
diff --git a/configure.ac b/configure.ac
index c6f0882..bd125a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,6 +398,20 @@ if test "x$enable_webserver" = xyes ; then
 	AC_DEFINE(UPNP_HAVE_WEBSERVER, 1, [see upnpconfig.h])
 fi
 
+RT_BOOL_ARG_ENABLE([ssdp], [yes], [SSDP part])
+if test "x$enable_ssdp" = xyes ; then
+        AC_DEFINE(UPNP_HAVE_SSDP, 1, [see upnpconfig.h])
+fi
+
+RT_BOOL_ARG_ENABLE([soap], [yes], [SOAP part])
+if test "x$enable_soap" = xyes ; then
+        AC_DEFINE(UPNP_HAVE_SOAP, 1, [see upnpconfig.h])
+fi
+
+RT_BOOL_ARG_ENABLE([gena], [yes], [GENA part])
+if test "x$enable_gena" = xyes ; then
+        AC_DEFINE(UPNP_HAVE_GENA, 1, [see upnpconfig.h])
+fi
 
 RT_BOOL_ARG_ENABLE([tools], [yes], [helper APIs in upnptools.h])
 if test "x$enable_tools" = xyes ; then
diff --git a/upnp/Makefile.am b/upnp/Makefile.am
index f949934..81f5948 100644
--- a/upnp/Makefile.am
+++ b/upnp/Makefile.am
@@ -95,18 +95,22 @@ libupnp_la_SOURCES = \
 	src/inc/webserver.h
 
 # ssdp
+if ENABLE_SSDP
 libupnp_la_SOURCES += \
 	src/ssdp/ssdp_ResultData.c \
 	src/ssdp/ssdp_ResultData.h \
 	src/ssdp/ssdp_device.c \
 	src/ssdp/ssdp_ctrlpt.c \
 	src/ssdp/ssdp_server.c
+endif
 
 # soap
+if ENABLE_SOAP
 libupnp_la_SOURCES += \
 	src/soap/soap_device.c \
 	src/soap/soap_ctrlpt.c \
 	src/soap/soap_common.c
+endif
 
 # genlib
 libupnp_la_SOURCES += \
@@ -127,10 +131,12 @@ libupnp_la_SOURCES += \
 	src/genlib/net/uri/uri.c
 
 # gena
+if ENABLE_GENA
 libupnp_la_SOURCES += \
 	src/gena/gena_device.c \
 	src/gena/gena_ctrlpt.c \
 	src/gena/gena_callback2.c
+endif
 
 # api
 libupnp_la_SOURCES += \
diff --git a/upnp/src/inc/config.h b/upnp/src/inc/config.h
index ccd49c1..06d9f68 100644
--- a/upnp/src/inc/config.h
+++ b/upnp/src/inc/config.h
@@ -435,11 +435,34 @@
 #endif
 
 
-/* configure --enable-webserver --enable-device */
+/* configure --enable-webserver */
 #if UPNP_HAVE_WEBSERVER
 #	define INTERNAL_WEB_SERVER	1
 #endif
 
+/* configure --enable-ssdp */
+#undef EXCLUDE_SSDP
+#if UPNP_HAVE_SSDP
+#       define EXCLUDE_SSSDP 0
+#else
+#       define EXCLUDE_SSSDP 1
+#endif
+
+/* configure --enable-soap */
+#undef EXCLUDE_SOAP
+#if UPNP_HAVE_SOAP
+#	define EXCLUDE_SOAP 0
+#else
+#	define EXCLUDE_SOAP 1
+#endif
+
+/* configure --enable-gena */
+#undef EXCLUDE_GENA
+#if UPNP_HAVE_GENA
+#       define EXCLUDE_GENA 0
+#else
+#       define EXCLUDE_GENA 1
+#endif
 
 #undef  EXCLUDE_WEB_SERVER
 #undef  EXCLUDE_MINISERVER