diff --git a/macosx/openssl.modules b/macosx/openssl.modules
index 92bf6396b..b4054eddb 100644
--- a/macosx/openssl.modules
+++ b/macosx/openssl.modules
@@ -14,12 +14,12 @@
     <repository type="tarball" name="apache" href="http://archive.apache.org/dist/"/>
 
     <!-- MODULES -->
-    
+
     <autotools id="openssl" autogen-sh="Configure" autogenargs="shared enable-ssl2"
-        autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s 
+        autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s
             --openssldir=%(prefix)s/etc/ssl %(autogenargs)s"
             makeargs="depend all"
-        makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_sw" 
+        makeinstallargs="INSTALL_PREFIX='$(DESTDIR)' install_sw"
         supports-parallel-builds="no"
         supports-non-srcdir-builds="no">
         <branch repo="openssl" version="1.0.2n" module="openssl-1.0.2n.tar.gz"/>
@@ -28,15 +28,16 @@
     <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} 
+      supports-non-srcdir-builds="no"
+        autogen-template="scons CFLAGS='-arch i386'
+            APR=${PREFIX}
+            APU=${PREFIX}
+            OPENSSL=${PREFIX}
             ZLIB=${PREFIX}
-            LINKFLAGS='-arch i386' 
-            APR_STATIC=true 
+            LINKFLAGS='-arch i386'
+            APR_STATIC=true
             PREFIX=%(prefix)s install"
         makeargs="-v" skip-install="true" check-target="false">
         <branch repo="apache" module="serf/serf-1.3.8.tar.bz2" version="1.3.8"/>
@@ -49,24 +50,21 @@
             <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}">
+    <autotools id="aprutil" autogen-sh="configure"
+      autogenargs="--with-apr=${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} 
+    <autotools id="subversion" supports-non-srcdir-builds="no"
+      autogen-sh="configure" autogenargs="--with-apr=${PREFIX}
             --with-apr-util=${PREFIX}
             --with-serf=${PREFIX}
             --without-apxs --with-ssl">