diff --git a/srcpkgs/distcc/patches/musl.patch b/srcpkgs/distcc/patches/musl.patch
deleted file mode 100644
index 4a0870e2033..00000000000
--- a/srcpkgs/distcc/patches/musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/zeroconf.c.orig	2015-05-31 12:47:36.561592772 +0200
-+++ ./src/zeroconf.c	2015-05-31 12:47:45.544688057 +0200
-@@ -33,6 +33,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <limits.h>
-+#include <fcntl.h>
- 
- #include <avahi-common/domain.h>
- #include <avahi-common/error.h>
diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template
index 0c1374935de..032aab31236 100644
--- a/srcpkgs/distcc/template
+++ b/srcpkgs/distcc/template
@@ -1,22 +1,36 @@
 # Template file for 'distcc'
 pkgname=distcc
-version=3.2rc1
-revision=16
+version=3.3.2
+revision=1
+wrksrc="$pkgname"
 build_style=gnu-configure
 configure_args="--disable-Werror --with-gtk"
 conf_files="
 	/etc/distcc/hosts
 	/etc/distcc/clients.allow"
-hostmakedepends="pkg-config"
-makedepends="python-devel popt-devel avahi-libs-devel gtk+-devel"
+hostmakedepends="automake libtool pkg-config"
+makedepends="binutils-devel popt-devel avahi-libs-devel gtk+-devel"
 short_desc="Distributed compilation for faster C/C++ builds"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
-distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
-checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
+distfiles="https://github.com/distcc/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
+checksum=64894de2970c631801d29c9962553673ea7a1d150e6855d7e166d273fca5cdfc
 conflicts="chroot-distcc>=0"
 
+subpackages="distcc-gtk"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --disable-pump-mode"
+else
+	makedepends+=" python3-devel"
+	subpackages+=" distcc-pump"
+fi
+
+pre_configure() {
+	./autogen.sh
+}
+
 post_install() {
 	local f x
 	# Remove useless files.
@@ -48,8 +62,6 @@ distcc-gtk_package() {
 	}
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
 distcc-pump_package() {
 	depends="distcc-${version}_${revision}"
 	short_desc+=" - Pump mode support files"
@@ -58,9 +70,7 @@ distcc-pump_package() {
 		vmove usr/bin/pump
 		vmove usr/share/man/man1/pump.1.gz
 		vmove usr/share/man/man1/include_server.1.gz
-		vmove usr/lib/python2.7
+		vmove usr/lib/python$py3_ver
 		vmove usr/share/doc/distcc/README.pump
 	}
 }
-
-fi # !CROSS_BUILD