diff --git a/net-libs/serf/patches/serf-1.3.7.patchset b/net-libs/serf/patches/serf-1.3.7.patchset
new file mode 100644
index 000000000..4ae91d00a
--- /dev/null
+++ b/net-libs/serf/patches/serf-1.3.7.patchset
@@ -0,0 +1,23 @@
+From 5dc2e27bbd86a6fdfc6a3d9a724abfb35619f979 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Wed, 17 Sep 2014 16:27:17 +0200
+Subject: remove option unknown to gcc2.
+
+
+diff --git a/SConstruct b/SConstruct
+index 0e4f988..0755dec 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -232,8 +232,7 @@ if sys.platform != 'win32':
+ 
+   ### These warnings are not available on Solaris
+   if sys.platform != 'sunos5': 
+-    env.Append(CCFLAGS=['-Wdeclaration-after-statement',
+-                        '-Wmissing-prototypes',
++    env.Append(CCFLAGS=['-Wmissing-prototypes',
+                         '-Wall'])
+ 
+   if debug:
+-- 
+1.8.3.4
+
diff --git a/net-libs/serf/serf-1.3.7.recipe b/net-libs/serf/serf-1.3.7.recipe
index 3ce9ddec7..fb4c6283f 100644
--- a/net-libs/serf/serf-1.3.7.recipe
+++ b/net-libs/serf/serf-1.3.7.recipe
@@ -11,8 +11,9 @@ COPYRIGHT="2002-2013 Justin Erenkrantz and Greg Stein"
 SRC_URI="http://serf.googlecode.com/svn/src_releases/serf-$portVersion.tar.bz2"
 CHECKSUM_SHA256="ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae"
 REVISION="1"
-ARCHITECTURES="?x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+PATCHES="serf-1.3.7.patchset"
 
 PROVIDES="
 	serf$secondaryArchSuffix = $portVersion
@@ -48,18 +49,18 @@ BUILD_PREREQUIRES="
 	"
 BUILD()
 {
-	scons $jobArgs OPENSSL=/system ZLIB=/system APR=/bin/apr-1-config \
-		APU=/bin/apu-1-config PREFIX=$prefix
+	scons $jobArgs OPENSSL=$portPackageLinksDir/devel~libssl$secondaryArchSuffix \
+		ZLIB=/system APR=/bin/apr-1-config APU=/bin/apu-1-config PREFIX=$prefix
 }
 
 INSTALL()
 {
-	scons install OPENSSL=/system ZLIB=/system APR=/bin/apr-1-config \
-		APU=/bin/apu-1-config PREFIX=$prefix
+	scons install OPENSSL=$portPackageLinksDir/devel~libssl$secondaryArchSuffix \
+		ZLIB=/system APR=/bin/apr-1-config APU=/bin/apu-1-config PREFIX=$prefix
 	
 	mkdir -p $includeDir $developLibDir
-	mv $prefix/include/serf-1 $includeDir/
-	rmdir $prefix/include
+	mv $prefix/include/serf-1/* $includeDir/
+	rm -rf $prefix/include
 	
 	# prepare development lib links
 	prepareInstalledDevelLib libserf-1