diff --git a/apache2/Makefile.am b/apache2/Makefile.am
index cd5d5f5c..db60a76b 100644
--- a/apache2/Makefile.am
+++ b/apache2/Makefile.am
@@ -17,9 +17,16 @@ mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
                           @LIBXML2_CFLAGS@ @LUA_CFLAGS@
 mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @LUA_CPPFLAGS@
 mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+
+if MACOSX
+mod_security2_la_LDFLAGS = -module -avoid-version \
+                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
+                           @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+else
 mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
                            @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
                            @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+endif
 
 install-exec-hook: $(pkglib_LTLIBRARIES)
 	@echo "Removing unused static libraries..."; \
diff --git a/configure.ac b/configure.ac
index 77699b38..5b34cdf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,35 @@ AC_SUBST(MSC_REGRESSION_DOCROOT_DIR)
 
 ### Configure Options
 
+#OS type
+
+AC_CANONICAL_HOST
+CANONICAL_HOST=$host
+
+#AH_TEMPLATE([AIX],     [Define if the operating system is AIX])
+#AH_TEMPLATE([LINUX],   [Define if the operating system is LINUX])
+#AH_TEMPLATE([IRIX],    [Define if the operating system is IRIX])
+#AH_TEMPLATE([SOLARIS], [Define if the operating system is SOLARIS])
+#AH_TEMPLATE([HPUX],    [Define if the operating system is HPUX])
+AH_TEMPLATE([MACOSX],  [Define if the operating system is Macintosh OSX])
+#AH_TEMPLATE([FREEBSD], [Define if the operating system is FREEBSD])
+#AH_TEMPLATE([TRU64],   [Define if the operating system is TRU64])
+
+
+case $host in
+  *-*-darwin*)
+    echo "Checking plataform... Identified as Macintosh OS X"
+    macos=true
+    ;;
+       *)
+    echo "Unknown CANONICAL_HOST $host"
+    exit
+    ;;
+esac
+
+AM_CONDITIONAL([MACOSX], [test x$macos = xtrue])
+
+#Subdirs
 TOPLEVEL_SUBDIRS="tools"
 
 # Apache2 Module