diff --git a/dev-db/oat/Manifest b/dev-db/oat/Manifest
index 17d8c6bb4..8c81361a0 100644
--- a/dev-db/oat/Manifest
+++ b/dev-db/oat/Manifest
@@ -1,3 +1,3 @@
 AUX oat-path.patch 1968 RMD160 9985cc3dc9103a35936e96d17ccdb73391b82a65 SHA1 89b172f8fb07938b74655d6d495b8a2b1ffd441c SHA256 00d9a1b106ca81d35ee62ce9fdc60439c75dae8878fe2700eb722255a5b281a6
 DIST oat-binary-1.3.1.zip 162398 RMD160 21fdd1bec8c6f836926a5c80fa418e59c9f6f558 SHA1 1cf60a996bf32258beda0a9c4bba20ea0acf2318 SHA256 664d540b268f46a184ed71ca024f177bad89e83f19450f37c512749a93b93a1d
-EBUILD oat-1.3.1.ebuild 768 RMD160 f6979d1350de41f0029ddbefa6a045676a45f5d0 SHA1 16d3057e09948217f7c3e9a50011eb6e22a737cf SHA256 cd9999a49ca856540e1adbd73ff991dbc01fd4bc00eb4f23d36f51d69aac4bac
+EBUILD oat-1.3.1.ebuild 734 RMD160 a2d12dd41f291beeca74d86eb906084160325d06 SHA1 7181119ac888d358dc2680f2f94be0ed4ffaa0ff SHA256 7d93532017f69b875f1639e035120cc35a3ebfd6846a35036e9530c42bb56315
diff --git a/dev-db/oat/oat-1.3.1.ebuild b/dev-db/oat/oat-1.3.1.ebuild
index bc460ad45..36e594fdc 100644
--- a/dev-db/oat/oat-1.3.1.ebuild
+++ b/dev-db/oat/oat-1.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-analyzer/sqlat/sqlat-1.1.0.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
 
 inherit eutils
-DESCRIPTION="The Oracle Auditing Tools is a toolkit that could be used to audit security within Oracle database servers"
-HOMEPAGE="http://www.cqure.net/wp/?page_id=2"
+DESCRIPTION="a toolkit that could be used to audit security within Oracle database servers"
+HOMEPAGE="http://www.cqure.net/wp/test/"
 SRC_URI="http://www.cqure.net/tools/${PN}-binary-${PV}.zip"
 
 LICENSE="GPL-2"
diff --git a/dev-db/sqid/Manifest b/dev-db/sqid/Manifest
index 7eafb4d44..ccb5db27a 100644
--- a/dev-db/sqid/Manifest
+++ b/dev-db/sqid/Manifest
@@ -1,2 +1,2 @@
 DIST sqid-0.3.tar.gz 7916 RMD160 7b30cdf60ae668e0c222a5bb5ea35d10045f24e1 SHA1 efc86e946c99e52262e2d3f75c430c7e42162e0e SHA256 b76ba9f76bdaeffbdf068c3668af79e1c700692ab288ce7f8cdb25c51dbb034d
-EBUILD sqid-0.3.ebuild 641 RMD160 f1e5063334a6df8388a8615c34ebd62cc09e3b2d SHA1 2152694ad4c37bc548a57f2a8595bb470d0c18b7 SHA256 e8f6ca34de09ed8bc5201eee9f999053f25a92e1629fbd019493caae146c4af3
+EBUILD sqid-0.3.ebuild 641 RMD160 117bb2402dbab10beb4c4f6935f2bf2799f682f7 SHA1 5c771c9eaa5cd6148222f215973d25e63e96d8e1 SHA256 cb5f111f2b39abec25ab6dd44d57ea0098afd91752fd9254d4e4a4b8532adaf4
diff --git a/dev-db/sqid/sqid-0.3.ebuild b/dev-db/sqid/sqid-0.3.ebuild
index 87958dd1a..e89905dd2 100644
--- a/dev-db/sqid/sqid-0.3.ebuild
+++ b/dev-db/sqid/sqid-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-analyzer/sqlinject/sqlinject-1.1.ebuild,v 1.1.1.1 2006/03/21 14:30:26 grimmlin Exp $
 
diff --git a/dev-db/sqlat/Manifest b/dev-db/sqlat/Manifest
index 4dcc85271..c787b3532 100644
--- a/dev-db/sqlat/Manifest
+++ b/dev-db/sqlat/Manifest
@@ -1,8 +1,2 @@
 DIST sqlat-src-1.1.0.tar.gz 50292 RMD160 c1d32d8fd50f3490d1f1313e2c99f6d1c98f3e6a SHA1 9b61eeb26e581984c5c1a2805bee3fb77e0a5385 SHA256 33ef7508838012b697f29ea87790514fe74b23e77d4da94f5351850384e86cad
-EBUILD sqlat-1.1.0.ebuild 874 RMD160 ff5eca19ee404e22a6907ee60b5cc9cbaa05ee64 SHA1 b1edcc9cc56ccc764e24c973ec74fb3a257dcc86 SHA256 f88fe2a92cbf6076203ab0f98fb1a8dd9dd2af9f02f6bc7162462b7f41a357c6
-MD5 231ae6744aaef869473027e901cbe727 sqlat-1.1.0.ebuild 874
-RMD160 ff5eca19ee404e22a6907ee60b5cc9cbaa05ee64 sqlat-1.1.0.ebuild 874
-SHA256 f88fe2a92cbf6076203ab0f98fb1a8dd9dd2af9f02f6bc7162462b7f41a357c6 sqlat-1.1.0.ebuild 874
-MD5 a7ee35e44e9d83b7e0556b51f49e7d55 files/digest-sqlat-1.1.0 244
-RMD160 3ae2ab617200f9670aa37ca628a119fa01f553a4 files/digest-sqlat-1.1.0 244
-SHA256 f202b6aad117965a39569cb2a18eca76c9190b3eed3a1c279c451dca6d656600 files/digest-sqlat-1.1.0 244
+EBUILD sqlat-1.1.0.ebuild 719 RMD160 6d7ebe262698b573e42d86b0d373d6f59d958b4f SHA1 593af8e83c22a1d7582b269eb28ec2622f29b9b5 SHA256 935fabc29f4f8491fa6d77f3b8c9bb4fb340631ec8815a2172d41fc1e29a238a
diff --git a/dev-db/sqlat/sqlat-1.1.0.ebuild b/dev-db/sqlat/sqlat-1.1.0.ebuild
index 9cf3b0d36..64c0da807 100644
--- a/dev-db/sqlat/sqlat-1.1.0.ebuild
+++ b/dev-db/sqlat/sqlat-1.1.0.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-analyzer/sqlat/sqlat-1.1.0.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
 
+EAPI="2"
+
 inherit eutils
 DESCRIPTION="SQLAT is a suite of tools which could be usefull for pentesting a MS SQL Server"
-HOMEPAGE="http://www.cqure.net/tools.jsp?id=6"
+HOMEPAGE="http://www.cqure.net/wp/sql-auditing-tools/"
 SRC_URI="http://www.cqure.net/tools/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND="=dev-db/freetds-0.62*"
+DEPEND="=dev-db/freetds-0.62*[mssql]"
 
-src_compile() {
-	if ! built_with_use dev-db/freetds mssql ; then
-		eerror "In order to build ${PN}, you need to have freetds with mssql support"
-		die "Re-emerge freetds with mssql useflag"
-	else
-		econf || die "Configure failed"
-		emake || die "Make failed"
-	fi	
+src_prepare() {
+	sed -i "s|-O6|$CFLAGS|g" Makefile.in || die "sed failed"
 }
-
 src_install () {
-	mkdir -p ${D}usr/bin
-	make DESTDIR=${D}usr install || die
+	mkdir -p "${D}"usr/bin
+	make DESTDIR="${D}"usr install || die
 	dodoc README
 }