diff --git a/macosx/openssl.modules b/macosx/openssl.modules
index 1ae6ce526..82d4416a4 100644
--- a/macosx/openssl.modules
+++ b/macosx/openssl.modules
@@ -2,19 +2,90 @@
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-<!--
-    This is a jhbuild moduleset that can be used to build openssl as required for
-    building Nmap, Ncat, and Nping. Use it like this:
-        jhbuild -m openssl.modules build openssl
--->
-    <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
 
+    <!-- INCLUDE -->
+
+    <include href="https://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
+
+    <!-- REPOSITORIES -->
+
+    <repository type="tarball" name="sourceforge" href="http://prdownloads.sourceforge.net/"/>
     <repository type="tarball" name="openssl" href="http://www.openssl.org/source/"/>
+    <repository type="tarball" name="apache" href="http://download.nextag.com/apache/"/>
+    <repository type="tarball" name="subversion" href="http://mirrors.ircam.fr/pub/apache/subversion/"/>
+    <repository type="tarball" name="serf" href="https://archive.apache.org/dist/serf/"/>
+
+    <!-- MODULES -->
+    
     <autotools id="openssl" autogen-sh="Configure" autogenargs="shared enable-ssl2"
-        autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
+        autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s 
+            --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
         makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_sw" 
         supports-non-srcdir-builds="no">
         <branch repo="openssl" version="1.0.2h" module="openssl-1.0.2h.tar.gz"/>
     </autotools>
 
-</moduleset>
+    <distutils id="scons">
+        <branch repo="sourceforge" module="scons/scons-2.5.0.tar.gz" version="2.5.0"/>
+    </distutils>
+ 
+    <autotools id="serf" autogen-sh=""
+        autogen-template="scons CFLAGS='-arch i386' 
+            APR=${PREFIX} 
+            APU=${PREFIX} 
+            OPENSSL=${PREFIX} 
+            ZLIB=${PREFIX}
+            LINKFLAGS='-arch i386' 
+            APR_STATIC=true 
+            PREFIX=%(prefix)s install"
+        makeargs="-v" skip-install="true" check-target="false">
+        <branch repo="serf" module="serf-1.3.8.tar.bz2" version="1.3.8"/>
+        <dependencies>
+            <dep package="scons"/>
+            <dep package="apr"/>
+            <dep package="aprutil"/>
+            <dep package="openssl"/>
+            <dep package="sqlite"/>
+            <dep package="zlib"/>
+        </dependencies>
+    </autotools>
+     
+    <autotools id="apr" autogen-sh="configure">
+        <branch repo="apache" module="apr/apr-1.5.2.tar.gz" version="1.5.2"/>
+    </autotools>
+
+    <autotools id="apriconv" autogen-sh="configure" autogenargs="--with-apr=${PREFIX}">
+        <branch repo="apache" module="apr/apr-iconv-1.2.1.tar.gz" version="1.2.1"/>
+    </autotools>
+
+    <autotools id="aprutil" autogen-sh="configure" 
+        autogenargs="--with-apr=${PREFIX} --with-iconv=${PREFIX}">
+        <branch repo="apache" module="apr/apr-util-1.5.4.tar.gz" version="1.5.4"/>
+        <dependencies>
+            <dep package="apr"/>
+        </dependencies>
+    </autotools>
+
+    <autotools id="subversion" autogen-sh="configure" autogenargs="--with-apr=${PREFIX} 
+            --with-apr-util=${PREFIX}
+            --with-serf=${PREFIX}
+            --without-apxs --with-ssl">
+        <branch repo="subversion" module="subversion-1.9.4.tar.gz" version="1.9.4"/>
+        <dependencies>
+            <dep package="apr"/>
+            <dep package="aprutil"/>
+            <dep package="openssl"/>
+            <dep package="serf"/>
+        </dependencies>
+    </autotools>
+
+    <!-- METAMODULE -->
+
+    <metamodule id="nmap-deps">
+        <dependencies>
+            <dep package="openssl" />
+            <dep package="subversion" />
+        </dependencies>
+    </metamodule>
+
+</moduleset>
\ No newline at end of file