diff --git a/cppcheck/trunk/PKGBUILD b/cppcheck/trunk/PKGBUILD
index 1ea8e9a4bb3..aceaca7be6e 100644
--- a/cppcheck/trunk/PKGBUILD
+++ b/cppcheck/trunk/PKGBUILD
@@ -1,52 +1,53 @@
 # Maintainer: Jelle van der Waa <jelle@archlinux.org>
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>

-pkgname=cppcheck
-pkgver=1.86
+pkgname=("cppcheck" "cppcheck-gui")
+pkgver=1.88
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('x86_64')
 url="http://cppcheck.sourceforge.net/"
 license=('GPL')
-depends=('qt5-base' 'python-pygments')
-makedepends=('docbook-xsl' 'qt5-tools' 'python')
+makedepends=('qt5-tools' 'docbook-xsl' 'python')
 source=($pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
-sha1sums=('03d21f48252e2f8a6742c53c4a7e01d0f40c35aa')
+sha1sums=('5d6b957bf4d40bf87585214019f5e50f2179fe37')

 build() {
    cd "${pkgname}-${pkgver}"
    export CXXFLAGS+=" -DNDEBUG"
    # Unicode fix
-   LANG='en_US.UTF-8' make SRCDIR=build CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes
-
+   LANG='en_US.UTF-8' make MATCHCOMPILER=yes CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes
    make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl CFGDIR=/usr/share/cppcheck/cfg man

    cd gui
    lrelease gui.pro
    qmake HAVE_RULES=yes
-   make SRCDIR=build CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes
+   make MATCHCOMPILER=yes CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes
 }

-check() {
+package_cppcheck() {
+   depends=('pcre')
+   optdepends=('python-pygments: for highlighted html output')
+   install="cppcheck.install"
+
    cd "${pkgname}-${pkgver}"
+   LANG='en_US.UTF-8' make DESTDIR="${pkgdir}" CFGDIR=/usr/share/cppcheck/cfg MATCHCOMPILER=yes HAVE_RULES=yes install

-   #LANG='en_US.UTF-8' make SRCDIR=build CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes test
-}
+   install -D -p -m 644 cppcheck.1 "${pkgdir}/usr/share/man/man1/cppcheck.1"

-package() {
-   cd "${pkgname}-${pkgver}"
-   LANG='en_US.UTF-8' make DESTDIR=${pkgdir} CFGDIR=/usr/share/cppcheck/cfg SRCDIR=build HAVE_RULES=yes install
+   install -d "${pkgdir}/usr/share/cppcheck/cfg"
+   install -D ./cfg/* -t "${pkgdir}/usr/share/cppcheck/cfg"
+}

-   install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
+package_cppcheck-gui() {
+   depends=('qt5-base' 'cppcheck')

-   # GUI
-   install -m755 gui/cppcheck-gui "${pkgdir}"/usr/bin
+   cd "cppcheck-${pkgver}"
+   install -dm0755 "${pkgdir}/usr/bin"
+   install -m755 gui/cppcheck-gui "${pkgdir}/usr/bin"
    install -d "${pkgdir}/usr/share/applications/"
    install -m644 gui/cppcheck-gui.desktop "${pkgdir}/usr/share/applications/"

-   install -d "${pkgdir}"/usr/share/cppcheck/cfg
-   install -D ./cfg/* -t "${pkgdir}"/usr/share/cppcheck/cfg
-
-   install -d "${pkgdir}"/usr/share/cppcheck/cfg/lang
-   install -D gui/*.qm -t "${pkgdir}"/usr/share/cppcheck/cfg/lang/
+   install -d "${pkgdir}/usr/share/cppcheck/cfg/lang"
+   install -D gui/*.qm -t "${pkgdir}/usr/share/cppcheck/cfg/lang/"
 }
diff --git a/cppcheck/trunk/cppcheck.install b/cppcheck/trunk/cppcheck.install
new file mode 100644
index 00000000000..4b6b34b4da7
--- /dev/null
+++ b/cppcheck/trunk/cppcheck.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+    if [ $(vercmp $2 1.88-1) -lt 0 ]; then
+        echo GUI part of this package has been moved to cppcheck-gui.
+    fi
+}