diff --git a/distcc-3.0-xinetd.patch b/distcc-3.0-xinetd.patch
deleted file mode 100644
index eefce50..0000000
--- a/distcc-3.0-xinetd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur distcc-3.0.orig/doc/example/xinetd distcc-3.0/doc/example/xinetd
---- distcc-3.0.orig/doc/example/xinetd	2008-08-07 05:52:13.000000000 +0900
-+++ distcc-3.0/doc/example/xinetd	2008-10-27 15:32:14.000000000 +0900
-@@ -19,10 +19,6 @@
- 	socket_type     = stream
- 	wait            = no
- 	user            = distcc
--	server          = /usr/local/bin/distccd
-+	server          = /usr/bin/distccd
- 	server_args     = --inetd
--
--        # This makes xinetd cope if there is no service listed in
--        # /etc/services
--        type            = UNLISTED
- }
diff --git a/distcc-3.2rc1.tar.bz2 b/distcc-3.2rc1.tar.bz2
deleted file mode 100644
index 482d7e6..0000000
--- a/distcc-3.2rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30
-size 609904
diff --git a/distcc.changes b/distcc.changes
index 28d0ae0..1ea8bfd 100644
--- a/distcc.changes
+++ b/distcc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 14 12:51:30 UTC 2017 - tchvatal@suse.com
+
+- Switch to github distribution as the code.google.com is dead
+- Drop the distcc-3.0-xinetd.patch as we do not install the service
+  and user can tweak it up to his liking
+
 -------------------------------------------------------------------
 Fri Jan  9 09:30:01 UTC 2015 - tchvatal@suse.com
 
diff --git a/distcc.spec b/distcc.spec
index 0f8910c..3e131d8 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package distcc
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,13 +22,12 @@ Release:        0
 Summary:        A fast, free distributed C/C++ compiler
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Url:            https://code.google.com/p/distcc/
-Source0:        http://distcc.googlecode.com/files/%{name}-%{version}.tar.bz2
+Url:            https://github.com/distcc/distcc
+Source0:        https://github.com/distcc/distcc/archive/v%{version}.tar.gz
 Source1:        distccd.sysconfig
 Source2:        distccd.service
 Source3:        distccd.firewall
 Patch0:         distcc-3.0-fix-fortify.patch
-Patch1:         distcc-3.0-xinetd.patch
 Patch2:         distcc-3.2_rc1-freedesktop.patch
 Patch3:         distcc-3.2_rc1-gssapi.patch
 Patch4:         distcc-3.2_rc1-python.patch
@@ -80,7 +79,6 @@ This package contains the compilation server needed to use %{name}.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -97,6 +95,8 @@ sed -i \
 autoreconf -fvi
 
 %build
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 %configure \
     --with-docdir=%{_docdir}/%{name} \
     --disable-Werror \
@@ -198,3 +198,4 @@ rm -rf %{buildroot}%{_docdir}/distcc/INSTALL
 %{_datadir}/applications/distccmon-gnome.desktop
 %{_datadir}/pixmaps/distccmon-gnome-icon.png
 
+%changelog
diff --git a/v3.2rc1.tar.gz b/v3.2rc1.tar.gz
new file mode 100644
index 0000000..430177b
--- /dev/null
+++ b/v3.2rc1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33e85981ff6afd94efc38b23b2d8b9036b3dff2dc6eac6982b9ff0ae1de64caa
+size 936590