diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index e1c06a4..3594817 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-libs/openssl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Nov 2011; Mario Fetka <mario.fetka@gmail.com> openssl-0.9.7m.ebuild:
+  patch Makefile for ldflags
+
   26 Dec 2010; Mario Fetka <mario.fetka@gmail.com> openssl-0.9.7m.ebuild:
   initial sloted ebuild for 0.9.7 libs
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 42fd3c2..6aed892 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -12,5 +12,5 @@ AUX openssl-0.9.7h-ABI-compat.patch 1131 RMD160 0b68f7abeabb4f76fd37f5371fe0f779
 AUX openssl-0.9.7i-m68k.patch 408 RMD160 e3d6c310fc2aac42915c8b5de409a12af76c30bd SHA1 4c0877f388ffc141ea0152b79db8f16e7e592e52 SHA256 13bcd35320c59b3d8eb5038698b80fb703a8aabb8af452831228c69db9e8cf9d
 AUX openssl-0.9.7j-doc-updates.patch 8748 RMD160 535a8611dfcb1a120a367be6fa5a8819cce5ec8c SHA1 d2b3729c0190f3191b89de6c76838f725d95e111 SHA256 42e118906eb960a96f4543682cb036bc26a1b16ed995382bc69140a0c1dac7c5
 DIST openssl-0.9.7m.tar.gz 3303943 RMD160 fed13325d90ae4749d7ee858931d6925c3955614 SHA1 546f6bcebdf72a633bad087469d3741a42f7b383 SHA256 c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
-EBUILD openssl-0.9.7m.ebuild 3853 RMD160 bb4c5fe6ccd843fb70c303f37de371f5254f4e24 SHA1 2c474cb14a00f2dd88b5f6dee13184855c083293 SHA256 44ebe4fbbdf94bf102e7f66d159c7aa71105a1681ecd046a6ac857a6c9ae838a
-MISC ChangeLog 231 RMD160 c91dbce2b518a2659842885e3833fb5f513028cf SHA1 6049b492dccb11bf330f4137225bb3748fbb8db9 SHA256 16c5d91611791bf6754c001e704b893c3cf38afeb80ae085c382f769245b690c
+EBUILD openssl-0.9.7m.ebuild 4457 RMD160 02b9e65af862bb7fe9698221bad3e9fbea3d2f16 SHA1 53a70483aeb6ccb1fc626e3eb37b5ce016436a93 SHA256 fa9d3355f9086a9bb5d257321e2f1968f1ba15c97ded376996ecca35924a588d
+MISC ChangeLog 335 RMD160 4bf86b324fb7eec7a7a33c41656138fcf9456f57 SHA1 062d7abcc2b910f0fed36c29201cd66062cdcd5f SHA256 2b7175a5dc473f7aef5e49400991c14f2da0322fd8d8ab676db9d0f1c28b953c
diff --git a/dev-libs/openssl/openssl-0.9.7m.ebuild b/dev-libs/openssl/openssl-0.9.7m.ebuild
index bbab7a2..7817e7b 100644
--- a/dev-libs/openssl/openssl-0.9.7m.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7m.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -114,6 +114,23 @@ src_compile() {
 		shared threads \
 		|| die "Configure failed"
 
+
+        # Clean out hardcoded flags that openssl uses
+        local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+                -e 's:^CFLAG=::' \
+                -e 's:-fomit-frame-pointer ::g' \
+                -e 's:-O[0-9] ::g' \
+                -e 's:-march=[-a-z0-9]* ::g' \
+                -e 's:-mcpu=[-a-z0-9]* ::g' \
+                -e 's:-m[a-z0-9]* ::g' \
+        )
+        sed -i \
+                -e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \
+                -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+                -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
+                Makefile || die
+
+
 	emake \
 		CC="$(tc-getCC)" MAKEDEPPROG="$(tc-getCC)" \
 		AR="$(tc-getAR) r" \