diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
index 3d48678d..f19d0bb1 100644
--- a/msys2-runtime/PKGBUILD
+++ b/msys2-runtime/PKGBUILD
@@ -35,8 +35,6 @@ prepare() {
 #	patch -p1 -i ${srcdir}/0002-revert-mounting.patch
 # This is the new code, but it doesn't handle Unix PATH lists very well.
 	patch -p1 -i ${srcdir}/0003-Add-msys2_path_conv.patch
-
-	
 }
 
 build() {
@@ -46,8 +44,14 @@ build() {
 	# Gives more verbose compile output when debugging.
 	if check_option "debug" "y"; then
 	  export CCWRAP_VERBOSE=1
+	  OPTIM="-O0"
+	else
+	  OPTIM="-O2"
 	fi
 
+	CFLAGS="$OPTIM -pipe -ggdb"
+	CXXFLAGS="$OPTIM -pipe -ggdb"
+
 	${srcdir}/msys2-runtime/configure \
 		--prefix=/usr \
 		--build=${CHOST} \