diff --git a/gui-apps/lswt/lswt-1.0.4.ebuild b/gui-apps/lswt/lswt-1.0.4-r1.ebuild
similarity index 80%
rename from gui-apps/lswt/lswt-1.0.4.ebuild
rename to gui-apps/lswt/lswt-1.0.4-r1.ebuild
index e3a5bc0252..d923c8b54a 100644
--- a/gui-apps/lswt/lswt-1.0.4.ebuild
+++ b/gui-apps/lswt/lswt-1.0.4-r1.ebuild
@@ -24,12 +24,16 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_prepare() {
+	default
+	sed '/^CFLAGS/{s/=/:=/;s/-Werror//;s/$/ $(CFLAGS)/}' \
+		-i Makefile || die
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	# Need to install to /usr instead of /usr/local
-	# and the Makefile doens't handle DESTDIR properly
-	emake PREFIX="${D}"/usr install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/gui-apps/lswt/lswt-9999.ebuild b/gui-apps/lswt/lswt-9999.ebuild
index e3a5bc0252..505b6eee62 100644
--- a/gui-apps/lswt/lswt-9999.ebuild
+++ b/gui-apps/lswt/lswt-9999.ebuild
@@ -24,12 +24,15 @@ DEPEND="dev-libs/wayland"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-util/wayland-scanner"
 
+src_prepare() {
+	default
+	sed '/^CFLAGS/s/-Werror//' -i Makefile || die
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	# Need to install to /usr instead of /usr/local
-	# and the Makefile doens't handle DESTDIR properly
-	emake PREFIX="${D}"/usr install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }