diff --git a/.gitmodules b/.gitmodules
index 1644c58..5c32437 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -118,3 +118,6 @@
 [submodule "fingerprint-gui"]
 	path = fingerprint-gui
 	url = ssh+git://aur@aur.archlinux.org/fingerprint-gui.git/
+[submodule "quimup"]
+	path = quimup
+	url = ssh+git://aur@aur.archlinux.org/quimup.git
diff --git a/quimup b/quimup
new file mode 160000
index 0000000..938b090
--- /dev/null
+++ b/quimup
@@ -0,0 +1 @@
+Subproject commit 938b09045fbe2e820c070f8f5611ae0309970975
diff --git a/quimup/.SRCINFO b/quimup/.SRCINFO
deleted file mode 100644
index 4665fed..0000000
--- a/quimup/.SRCINFO
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgbase = quimup
-	pkgdesc = A simple Qt5 frontend to MPD
-	pkgver = 1.4.0
-	pkgrel = 2
-	url = http://coonsden.com/
-	arch = i686
-	arch = x86_64
-	license = GPL2
-	depends = mpd
-	depends = qt5-base
-	depends = taglib
-	source = http://sourceforge.net/projects/quimup/files/quimup 1.4.0/quimup_1.4.0_src.tar.gz
-	source = qt-build.patch
-	md5sums = 5f5f04bbf9674c278dacab963643bba2
-	md5sums = 1b37692052408024dc0c9e8b6fe6fc91
-
-pkgname = quimup
-
diff --git a/quimup/PKGBUILD b/quimup/PKGBUILD
deleted file mode 100644
index 981d6ff..0000000
--- a/quimup/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
-
-pkgname=quimup
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="A simple Qt5 frontend to MPD"
-arch=('i686' 'x86_64')
-url="http://coonsden.com/"
-license=('GPL2')
-makedepends=()
-depends=('mpd' 'qt5-base' 'taglib')
-source=("http://sourceforge.net/projects/quimup/files/quimup ${pkgver}/${pkgname}_${pkgver}_src.tar.gz"
-        "qt-build.patch")
-md5sums=('5f5f04bbf9674c278dacab963643bba2'
-         '1b37692052408024dc0c9e8b6fe6fc91')
-
-prepare() {
-  rm -rf "${srcdir}/build"
-  mkdir "${srcdir}/build"
-  patch -p0 -i "qt-build.patch"
-}
-
-build() {
-  cd build
-  qmake-qt5 PREFIX=/usr -Wnone "../${pkgname} ${pkgver}/quimup.pro"
-  make
-}
-
-package() {
-  # there is no install target
-  install -Dm755 "${srcdir}/build/quimup" "${pkgdir}/usr/bin/quimup"
-}
-
diff --git a/quimup/qt-build.patch b/quimup/qt-build.patch
deleted file mode 100644
index 98ee88c..0000000
--- a/quimup/qt-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN "quimup 1.4.0.orig/src/qtlocalpeer.cpp" "quimup 1.4.0/src/qtlocalpeer.cpp"
---- "quimup 1.4.0.orig/src/qtlocalpeer.cpp"	2015-08-10 23:57:01.445463175 +0300
-+++ "quimup 1.4.0/src/qtlocalpeer.cpp"	2015-08-10 23:57:56.583441177 +0300
-@@ -40,6 +40,7 @@
- 
- #include "qtlocalpeer.h"
- #include <QCoreApplication>
-+#include <QDataStream>
- #include <QTime>
- 
- #if defined(Q_OS_WIN)