diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
index 72946faeecfd2..a096611ae0f71 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
@@ -22,7 +22,7 @@ src_prepare() {
 	tc-export CC
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
+		-e '/^CFLAGS/s:-g:-std=gnu89:' \
 		-i Makefile || die
 }
 
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
index 72946faeecfd2..a096611ae0f71 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
@@ -22,7 +22,7 @@ src_prepare() {
 	tc-export CC
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
+		-e '/^CFLAGS/s:-g:-std=gnu89:' \
 		-i Makefile || die
 }
 
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index ba397f60af140..efe854676fb72 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 	tc-export CC
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
-		-e '/^CFLAGS/s:-g::' \
+		-e '/^CFLAGS/s:-g:-std=gnu89:' \
 		-i Makefile || die
 }
 
diff --git a/sys-fs/bcache-tools/metadata.xml b/sys-fs/bcache-tools/metadata.xml
index 3441f18d859b1..a311ddc99284a 100644
--- a/sys-fs/bcache-tools/metadata.xml
+++ b/sys-fs/bcache-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>