diff --git a/mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch b/mingw-w64-hlsl2glsl/0001-CMakeLists.txt-Fixes-and-improvements.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl-git/0001-CMakeLists.txt-Fixes-and-improvements.patch
rename to mingw-w64-hlsl2glsl/0001-CMakeLists.txt-Fixes-and-improvements.patch
diff --git a/mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch b/mingw-w64-hlsl2glsl/0002-Fix-pool_allocator-compile-guards.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl-git/0002-Fix-pool_allocator-compile-guards.patch
rename to mingw-w64-hlsl2glsl/0002-Fix-pool_allocator-compile-guards.patch
diff --git a/mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch b/mingw-w64-hlsl2glsl/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl-git/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
rename to mingw-w64-hlsl2glsl/0003-hlsl2glsltest-Change-_MSC_VER-to-_WIN32.patch
diff --git a/mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch b/mingw-w64-hlsl2glsl/0004-CMake-Handle-installation.patch
similarity index 100%
rename from mingw-w64-hlsl2glsl-git/0004-CMake-Handle-installation.patch
rename to mingw-w64-hlsl2glsl/0004-CMake-Handle-installation.patch
diff --git a/mingw-w64-hlsl2glsl-git/PKGBUILD b/mingw-w64-hlsl2glsl/PKGBUILD
similarity index 85%
rename from mingw-w64-hlsl2glsl-git/PKGBUILD
rename to mingw-w64-hlsl2glsl/PKGBUILD
index 5f27bb667b..6d12b3f163 100644
--- a/mingw-w64-hlsl2glsl-git/PKGBUILD
+++ b/mingw-w64-hlsl2glsl/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 _realname=hlsl2glsl
-pkgbase=mingw-w64-${_realname}-git
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=r848.14dd189
 pkgrel=1
 epoch=1
@@ -13,8 +13,9 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/aras-p/hlsl2glslfork'
 license=('MIT')
 makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc")
-provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-git=${pkgver}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
+replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 options=('!strip' '!emptydirs')
 _commit="14dd189562ea32979ff9b1ac9b047c744393f7bf"
 source=("${_realname}"::"git+https://github.com/aras-p/hlsl2glslfork.git#commit=${_commit}"
@@ -44,9 +45,12 @@ prepare() {
 build() {
   mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
+  CXXFLAGS+=" -std=gnu++11"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
     ${MINGW_PREFIX}/bin/cmake \
       -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
       -G"MSYS Makefiles" \
       "${srcdir}"/${_realname}