diff --git a/srcpkgs/git-gui b/srcpkgs/git-gui
new file mode 120000
index 00000000000..0899c2993da
--- /dev/null
+++ b/srcpkgs/git-gui
@@ -0,0 +1 @@
+git
\ No newline at end of file
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 86e71c7330b..b1cb63b2dfa 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,13 +1,13 @@
 # Template build file for "git".
 pkgname=git
 version=2.1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-curl --with-expat --without-tcltk
+configure_args="--with-curl --with-expat --with-tcltk
  ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no"
 make_install_args="NO_INSTALL_HARDLINKS=1"
 hostmakedepends="xmlto>=0.0.25_2 asciidoc perl python"
-makedepends="libressl-devel libcurl-devel expat-devel"
+makedepends="libressl-devel libcurl-devel expat-devel tk-devel"
 # Required by https://
 depends="ca-certificates"
 replaces="git-docs>=0"
@@ -18,7 +18,7 @@ license="GPL-2"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57
 
-subpackages="git-svn git-perl"
+subpackages="git-svn git-perl gitk git-gui"
 
 post_build() {
 	make ${makejobs} -C Documentation man
@@ -54,3 +54,24 @@ git-svn_package() {
 		vmove "usr/share/man/man3/Git::SVN*"
 	}
 }
+
+gitk_package() {
+    depends="git-${version}_${revision} tk"
+    short_desc="The Git repository browser"
+    pkg_install() {
+        vmove usr/bin/gitk
+        vmove usr/share/gitk
+        vmove usr/share/man/man1/gitk.1
+    }
+}
+
+git-gui_package() {
+    depends="git-${version}_${revision} tk"
+    short_desc+="A portable graphical interface to Git"
+    pkg_install() {
+        vmove usr/libexec/git-core/git-gui--askpass
+        vmove usr/libexec/git-core/git-gui
+        vmove usr/share/man/man1/git-gui.1
+        vmove usr/share/git-gui/
+    }
+}
diff --git a/srcpkgs/gitk b/srcpkgs/gitk
new file mode 120000
index 00000000000..0899c2993da
--- /dev/null
+++ b/srcpkgs/gitk
@@ -0,0 +1 @@
+git
\ No newline at end of file