diff --git a/lmms/PKGBUILD b/lmms/PKGBUILD
index 68b6ce3f8..8776bc84c 100644
--- a/lmms/PKGBUILD
+++ b/lmms/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=lmms
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc='The Linux MultiMedia Studio.'
 url='http://lmms.sourceforge.net'
 arch=('x86_64')
@@ -13,13 +13,22 @@ optdepends=('wine: VST support (experimental)'
 makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'stk' 'fftw' 'gcc-multilib')
 categories=('multimedia')
 install="lmms.install"
-source=("https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz")
-md5sums=('88d9e66d240b711c37315e3c9da644a1')
+source=("https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz"
+	"make-werrror-optional.patch")
+md5sums=('88d9e66d240b711c37315e3c9da644a1'
+         '2c6e51b665c34fa61dc8b23e129404a9')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
+
+  patch -Np1 -i ../make-werrror-optional.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWANT_VST_NOWINE=ON
   make
 }
diff --git a/lmms/make-werrror-optional.patch b/lmms/make-werrror-optional.patch
new file mode 100644
index 000000000..69445b18d
--- /dev/null
+++ b/lmms/make-werrror-optional.patch
@@ -0,0 +1,22 @@
+From 9cc1a5931c34535436a2fb82e51031121b3a53d1 Mon Sep 17 00:00:00 2001
+From: Lukas W <lukaswhl@gmail.com>
+Date: Thu, 22 Jan 2015 12:39:20 +0100
+Subject: [PATCH] Make -Werror optional
+
+---
+ CMakeLists.txt                | 3 ++-
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4cb7407..a526df3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -358,7 +358,8 @@ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in" "${CM
+ 
+ # set compiler flags
+ SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
+-IF(NOT LMMS_BUILD_APPLE)
++OPTION(USE_WERROR "Add -werror to the build flags. Stops the build on warnings" OFF)
++IF(${USE_WERROR})
+    SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
+ ENDIF()
+