diff --git a/security/steghide/Portfile b/security/steghide/Portfile
index 195b6ca1ddd..5422baeaed0 100644
--- a/security/steghide/Portfile
+++ b/security/steghide/Portfile
@@ -22,6 +22,8 @@ master_sites        sourceforge:project/${name}/${name}/${version}
 configure.args      --mandir=${prefix}/share/man
 
 patchfiles          patch-build-with-gcc-4.diff \
+                    patch-MHashPP.diff \
+                    patch-src-BmpFile.cc.diff \
                     patch-src-Makefile.am.diff \
                     patch-src-Makefile.in.diff \
                     patch-src-gettext.h.diff \
diff --git a/security/steghide/files/patch-MHashPP.diff b/security/steghide/files/patch-MHashPP.diff
new file mode 100644
index 00000000000..41cf20a7503
--- /dev/null
+++ b/security/steghide/files/patch-MHashPP.diff
@@ -0,0 +1,30 @@
+--- src/MHashPP.h.orig	2003-09-29 01:30:30.000000000 +1000
++++ src/MHashPP.h	2012-05-13 01:32:20.000000000 +1000
+@@ -21,6 +21,7 @@
+ #ifndef SH_MHASHPP_H
+ #define SH_MHASHPP_H
+ 
++#define _Bool bool
+ #include <mhash.h>
+ 
+ #include "common.h"
+--- src/MHashPP.cc.orig	2003-10-05 20:17:50.000000000 +1000
++++ src/MHashPP.cc	2012-05-13 01:32:30.000000000 +1000
+@@ -21,6 +21,7 @@
+ #include <cstdlib>
+ #include <string>
+ 
++#define _Bool bool
+ #include <mhash.h>
+ 
+ #include "BitString.h"
+--- src/MHashKeyGen.h.orig	2003-09-29 01:30:30.000000000 +1000
++++ src/MHashKeyGen.h	2012-05-13 02:02:12.000000000 +1000
+@@ -23,6 +23,7 @@
+ 
+ #include <vector>
+ 
++#define _Bool bool
+ #include <mhash.h>
+ 
+ class MHashKeyGen {
diff --git a/security/steghide/files/patch-src-BmpFile.cc.diff b/security/steghide/files/patch-src-BmpFile.cc.diff
new file mode 100644
index 00000000000..ec71f97a5bd
--- /dev/null
+++ b/security/steghide/files/patch-src-BmpFile.cc.diff
@@ -0,0 +1,15 @@
+--- src/BmpFile.cc.orig	2011-06-21 15:28:36.000000000 +0200
++++ src/BmpFile.cc	2011-06-21 15:28:40.000000000 +0200
+@@ -214,10 +214,10 @@
+ 		// create reservoir - for every i reservoir[i] contains the sample values that are neighbourss of
+ 		// the sample value with label i and have a lower label (and have already been found)
+ 		// This is necessary to use collapsing trees together with bucket sort (without huge increase in memory usage)
+-		std::vector<BmpRGBSampleValue*> reservoir[svs.size()] ;
++		std::vector<std::vector<BmpRGBSampleValue*> > reservoir(svs.size()) ;
+ 
+ 		// neighbours sorted by distance (for the current source sample value)
+-		std::vector<BmpRGBSampleValue*> neighbours_byd[r + 1] ;
++		std::vector<std::vector<BmpRGBSampleValue*> > neighbours_byd(r + 1) ;
+ 
+ 		for (std::vector<SampleValue*>::const_iterator srcsvit = svs.begin() ; srcsvit != svs.end() ; srcsvit++) {
+ 			BmpRGBSampleValue* srcsv = (BmpRGBSampleValue*) (*srcsvit) ;