diff --git a/srcpkgs/DataGrip/template b/srcpkgs/DataGrip/template
new file mode 100644
index 0000000000..eaf318d046
--- /dev/null
+++ b/srcpkgs/DataGrip/template
@@ -0,0 +1,56 @@
+# Template file for 'DataGrip'
+pkgname=DataGrip
+version=2019.3.3
+revision=1
+archs="i686 x86_64"
+wrksrc="DataGrip-${version}"
+depends="jetbrains-jdk-bin"
+short_desc="Cross-Platform IDE for Databases & SQL by JetBrains"
+maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
+license="custom:Commercial"
+homepage="https://www.jetbrains.com/datagrip"
+distfiles="https://download.jetbrains.com/datagrip/datagrip-${version}.tar.gz"
+checksum=307a298017cee716a6191a920170e8bdd68f895eba7eb5568998e1070c8f7e7d
+repository=nonfree
+restricted=yes
+nopie=yes
+
+post_extract() {
+	# Remove files for other CPU architectures
+	rm -rf lib/pty4j-native/linux/ppc64le
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64)
+			rm -rf bin/fsnotifier
+			rm -rf bin/datagrip.vmoptions
+			rm -rf lib/pty4j-native/linux/x86
+			;;
+		i686)
+			rm -rf bin/fsnotifier64
+			rm -rf bin/datagrip64.vmoptions
+			rm -rf lib/pty4j-native/linux/x86_64
+			;;
+	esac
+}
+
+do_install() {
+	TARGET_PATH="usr/lib/${pkgname}"
+
+	vmkdir usr/bin
+	vmkdir ${TARGET_PATH}
+
+	local i
+	for i in license/* ; do
+		vlicense $i
+	done
+
+	mkdir -p /usr/lib/jvm/jbrsdk
+	ln -sf /usr/lib/jvm/jbrsdk ${DESTDIR}/${TARGET_PATH}/jbr
+	vcopy bin ${TARGET_PATH}
+	vcopy lib ${TARGET_PATH}
+	vcopy plugins ${TARGET_PATH}
+	vcopy product-info.json ${TARGET_PATH}
+	vcopy build.txt ${TARGET_PATH}
+
+	ln -sf /${TARGET_PATH}/bin/datagrip.sh ${DESTDIR}/usr/bin/${pkgname}
+}
diff --git a/srcpkgs/DataGrip/update b/srcpkgs/DataGrip/update
new file mode 100644
index 0000000000..633d5453b1
--- /dev/null
+++ b/srcpkgs/DataGrip/update
@@ -0,0 +1,2 @@
+pattern="datagrip-\K[\d.]+(?=\.tar)"
+site="https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release"